X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Ftests%2Fgitattributes;h=fd3faa35899acc3e43bd5870ee5b7e7c4773150e;hb=606993b2249c69f0a3b6ee95c4cf42dc97c99e83;hp=fcbe313b623d7a8b1cde10f648bb7a20ce86c493;hpb=a7e7ff6e3046e32bf67af2c25f6ef7aca299bbca;p=dgit.git

diff --git a/tests/tests/gitattributes b/tests/tests/gitattributes
index fcbe313b..fd3faa35 100755
--- a/tests/tests/gitattributes
+++ b/tests/tests/gitattributes
@@ -7,6 +7,7 @@ t-dependencies man-db git-man
 t-tstunt-parsechangelog
 
 t-archive-none example
+t-git-none
 bv=1.0
 t-worktree $bv
 
@@ -105,19 +106,20 @@ sfmt_setup () {
 sfmt_import () {
 	inst=$1
 	dgitargs=$2
-	refname="import.$sfmt-$inst"
+	branch="import.$sfmt-$inst"
 	brkerr=stderr.$sfmt-$inst.broken
 	dscf=${p}_${v}.dsc
+	sums=sums.$sfmt-$inst
 
 	mkdir $pdb-import-$inst
 	cd $pdb-import-$inst
 	git init
 
 	LC_MESSAGES=C \
-	t-dgit $dgitargs import-dsc ../$dscf +$refname.broken \
+	t-dgit $dgitargs import-dsc ../$dscf +$branch.broken \
 		2>&1 |tee ../$brkerr
 	fgrep 'warning: source tree contains .gitattributes' ../$brkerr
-	git checkout $refname.broken
+	git checkout $branch.broken
 	sha256sum af/* >../$sums.broken
 
 	for s in ../sums ../$sums.broken; do
@@ -132,13 +134,11 @@ sfmt_import () {
 
 	t-dgit setup-new-tree
 
-	t-dgit $dgitargs import-dsc ../$dscf +$refname
-	git checkout $refname
-
-	sums=sums.$sfmt-$inst
+	t-dgit $dgitargs import-dsc ../$dscf +$branch
+	git checkout $branch
 
 	for f in af/*; do
-		git cat-file blob "refs/heads/$refname:$f" \
+		git cat-file blob "refs/heads/$branch:$f" \
 			| sha256sum \
 			| sed -e 's#-$#'$f'#' \
 		>>../$sums