summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
0987f3f)
No functional change.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
quiltmode=baredebian
v=1.0-1
suite=sid
quiltmode=baredebian
v=1.0-1
suite=sid
}
baredebian-test-core () {
}
baredebian-test-core () {
t-dgit -wn --dgit-view-save=split.f1 --$quiltmode quilt-fixup
t-dgit -wn --dgit-view-save=split.f1 --$quiltmode quilt-fixup
- tar --strip-components=1 -axf ../${p}_${v%-*}.orig.tar.*
+ tar --strip-components=1 -axf ../${p}_${uv}.orig.tar.*
cd debian
git clean -xdff
cd debian
git clean -xdff
t-dgit -wn --quilt=$quiltmode --dgit-view-save=split.b quilt-fixup
t-dgit -wn --quilt=$quiltmode --dgit-view-save=split.p --new push
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${v%-*} split.p
+ git merge-base --is-ancestor v$uv split.p
git merge-base --is-ancestor HEAD split.p
git merge-base --is-ancestor HEAD split.p
- set +e; git merge-base HEAD v${v%-*}; rc=$?; set -e; [ $rc = 1 ]
+ set +e; git merge-base HEAD v$uv; rc=$?; set -e; [ $rc = 1 ]
git clean -xdff
# t-pushed-good-* wants a clean tree to start with, but this
git clean -xdff
# t-pushed-good-* wants a clean tree to start with, but this