diff options
Diffstat (limited to 'tests/lib-baredebian')
| -rw-r--r-- | tests/lib-baredebian | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/lib-baredebian b/tests/lib-baredebian index f4ed421..368aa78 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 |