From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 30 Jun 2019 10:11:50 +0000 (+0100)
Subject: test suite: lib-baredebian: Break out $uvtag
X-Git-Tag: archive/debian/9.0~39
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=3061dc7b8596d4727361758ad266c6080f6886f6

test suite: lib-baredebian: Break out $uvtag

No functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

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