chiark / gitweb /
test suite: lib-baredebian: Tolerate uvtag not being set
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 30 Jun 2019 09:59:41 +0000 (10:59 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 30 Jun 2019 20:11:18 +0000 (21:11 +0100)
No functional change with the existing test.

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

index f4ed4217bdcb9f9091c758ff1571b511f602fa1e..368aa78ff1c2ae63b524329b516ef9ea2f37cfad 100644 (file)
@@ -48,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
 
        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 $uvtag split.p
        git merge-base --is-ancestor HEAD     split.p
        git merge-base --is-ancestor HEAD     split.p
-       set +e; git merge-base HEAD $uvtag; 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
 
        git clean -xdff
        # t-pushed-good-* wants a clean tree to start with, but this