X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Flib;h=046d36289c1145b53d37f7b7d1dbd4d575e4d9b2;hb=c17699d17f17f6ea105b7440ff95fa39eebb54a6;hp=9fc056e6d12455f321e53cc610f1b3aef54fed02;hpb=2522d3ba9ca4b00bffc107342f471fabac0a04b9;p=dgit.git

diff --git a/tests/lib b/tests/lib
index 9fc056e6..046d3628 100644
--- a/tests/lib
+++ b/tests/lib
@@ -92,7 +92,7 @@ t-expect-push-fail () {
 t-git-objects-not-present () {
 	# t-git-objects-not-present GITDIR|'' OBJID [...]
 	# specifying '' means the repo for package $p
-	local gitdir="${1-$tmp/git/$p.git}"
+	local gitdir="${1-$dgitrepo}"
 	local obj
 	if ! [ -e "$gitdir" ]; then return; fi
 	for obj in "$@"; do
@@ -107,8 +107,8 @@ t-reporefs () {
 	local outputfile="$tmp/show-refs.$whichoutput"
 	(set -e
 	 exec >"$outputfile"
-	 if test -d $tmp/git/$p.git; then
-		cd $tmp/git/$p.git
+	 if test -d $dgitrepo; then
+		cd $dgitrepo
 		git show-ref |sort
 	fi)
 }
@@ -128,8 +128,13 @@ t-worktree () {
 	t-untar $troot/worktrees/${p}_$1
 }
 
-t-git () {
+t-select-package () {
 	p=$1
+	dgitrepo=$tmp/git/$p.git
+}
+
+t-git () {
+	t-select-package $1
 	v=$2
 	mkdir -p $tmp/git
 	local gs=$troot/git-srcs/${p}_$v.git
@@ -155,7 +160,7 @@ t-has-ancestor () {
 }
 
 t-prep-newpackage () {
-	p=$1
+	t-select-package $1
 	v=$2
 	t-archive-none $p
 	t-git-none
@@ -169,7 +174,7 @@ t-prep-newpackage () {
 }
 
 t-archive-none () {
-	p=$1
+	t-select-package $1
 	mkdir -p $tmp/aq $tmp/mirror/pool/main
 
 	local suite=sid
@@ -247,11 +252,11 @@ t-archive () {
 }
 
 t-git-dir-time-passes () {
-	touch -d 'last year' $tmp/git/$p.git
+	touch -d 'last year' $dgitrepo
 }
 
 t-git-dir-check () {
-	local gitdir=$tmp/git/$p.git
+	local gitdir=$dgitrepo
 	case "$1" in
 	enoent)
 		if test -e "$gitdir"; then fail "$gitdir exists"; fi
@@ -403,7 +408,7 @@ t-pushed-good () {
 	t-refs-notexist \
 		refs/heads/dgit/unstable \
 		refs/remotes/dgit/dgit/unstable
-	(set -e; cd $tmp/git/$p.git
+	(set -e; cd $dgitrepo
 	 t-refs-same \
 		refs/dgit/sid \
 		`t-v-tag`
@@ -456,15 +461,6 @@ t-tstunt-parsechangelog () {
 	t-tstunt dpkg-parsechangelog Dpkg/Changelog/Parse.pm
 }
 
-t-prep-mergechangelogs () {
-	local b=merge.dpkg-mergechangelogs
-	git config $b.name 'debian/changelog merge driver'
-	git config $b.driver 'dpkg-mergechangelogs -m %O %A %B %A'
-	mkdir -p .git/info
-	echo >>.git/info/attributes \
-		'debian/changelog merge=dpkg-mergechangelogs'
-}
-
 t-ref-dsc-dgit () {
 	local dsc=${p}_${v}.dsc
 	local val=`t-822-field $tmp/incoming/$dsc Dgit`