From 3061dc7b8596d4727361758ad266c6080f6886f6 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 30 Jun 2019 11:11:50 +0100 Subject: [PATCH] test suite: lib-baredebian: Break out $uvtag No functional change. Signed-off-by: Ian Jackson --- tests/lib-baredebian | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/lib-baredebian b/tests/lib-baredebian index 768b0d5c..f4ed4217 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 -- 2.30.2