From 7dcd41932bc717336931920636b073c02e6b38f7 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 30 Jun 2019 10:59:41 +0100 Subject: [PATCH] test suite: lib-baredebian: Tolerate uvtag not being set No functional change with the existing test. Signed-off-by: Ian Jackson --- tests/lib-baredebian | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/lib-baredebian b/tests/lib-baredebian index f4ed4217..368aa78f 100644 --- a/tests/lib-baredebian +++ b/tests/lib-baredebian @@ -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 - git merge-base --is-ancestor $uvtag 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 -- 2.30.2