summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/lib-baredebian5
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/lib-baredebian b/tests/lib-baredebian
index 768b0d5..f4ed421 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