test suite: lib-baredebian: Tolerate uvtag not being set

[dgit.git] / tests / lib-baredebian

diff --git a/tests/lib-baredebian b/tests/lib-baredebian
index 768b0d5cd400fe4f6000bd62512933d786115e38..368aa78ff1c2ae63b524329b516ef9ea2f37cfad 100644 (file)
--- 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,11 @@ 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 HEAD     split.p
-       set +e; git merge-base HEAD v$uv; rc=$?; set -e; [ $rc = 1 ]
+       if [ "$uvtag" ]; then
+               git merge-base --is-ancestor $uvtag split.p
+               set +e; git merge-base HEAD $uvtag; rc=$?; set -e; [ $rc = 1 ]
+       fi
 
        git clean -xdff
        # t-pushed-good-* wants a clean tree to start with, but this