summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
14032a2)
No functional change with the existing test.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
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 $uvtag split.p
git merge-base --is-ancestor HEAD 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
git clean -xdff
# t-pushed-good-* wants a clean tree to start with, but this