X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Flib-baredebian;h=f4ed4217bdcb9f9091c758ff1571b511f602fa1e;hb=3061dc7b8596d4727361758ad266c6080f6886f6;hp=768b0d5cd400fe4f6000bd62512933d786115e38;hpb=c512ab74b0779566aeb88242480e5b4cbbc0c811;p=dgit.git

diff --git a/tests/lib-baredebian b/tests/lib-baredebian
index 768b0d5c..f4ed4217 100644
--- a/tests/lib-baredebian
+++ b/tests/lib-baredebian
@@ -5,6 +5,7 @@ baredebian-test-vars () {
 	v=1.0-1
 	suite=sid
 	uv=${v%-*}
+	uvtag=v$uv
 }
 
 baredebian-test-core () {
@@ -47,9 +48,9 @@ baredebian-test-core () {
 	t-dgit -wn --quilt=$quiltmode --dgit-view-save=split.b quilt-fixup
 	t-dgit -wn --quilt=$quiltmode --dgit-view-save=split.p --new push
 
-	git merge-base --is-ancestor v$uv split.p
+	git merge-base --is-ancestor $uvtag split.p
 	git merge-base --is-ancestor HEAD     split.p
-	set +e; git merge-base HEAD v$uv; rc=$?; set -e; [ $rc = 1 ]
+	set +e; git merge-base HEAD $uvtag; rc=$?; set -e; [ $rc = 1 ]
 
 	git clean -xdff
 	# t-pushed-good-* wants a clean tree to start with, but this