diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2019-06-30 11:11:50 +0100 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2019-06-30 21:11:17 +0100 |
| commit | 3061dc7b8596d4727361758ad266c6080f6886f6 (patch) | |
| tree | a48d3acce069edbbc4d3070728316fba5b7ef009 | |
| parent | c512ab74b0779566aeb88242480e5b4cbbc0c811 (diff) | |
test suite: lib-baredebian: Break out $uvtag
No functional change.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| -rw-r--r-- | tests/lib-baredebian | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/lib-baredebian b/tests/lib-baredebian index 768b0d5..f4ed421 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 |