No functional change.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
v=1.0-1
suite=sid
uv=${v%-*}
+ uvtag=v$uv
}
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