4 t-expect-fail 'contradicts clean mode git-ff' \
5 t-dgit -wgf --dgit-view-save=split.f1 --baredebian quilt-fixup
7 t-dgit -wn --dgit-view-save=split.f1 --baredebian quilt-fixup
12 tar --strip-components=1 -axf ../${p}_${v%-*}.orig.tar.*
16 git checkout HEAD -- .
19 # Now we are in this insane state that people seem to expect
21 export QUILT_PATCHES=debian/patches
26 git diff --cached --exit-code split.f1 -- :/ :!/debian
27 git diff --exit-code HEAD..split.f1 -- :/debian
30 quilt new made-with-quilt
35 git add debian/patches/.
36 t-commit 'extra patch made with quilt' 1.0-2
38 dpkg-buildpackage -uc -us --build=source
39 # ^ Do this by hand here not because we expect users to do this
40 # (rather than dgit build), but so that we can check that our
41 # output is the same as users are used to.
43 t-dgit -wn --quilt=baredebian --dgit-view-save=split.b quilt-fixup
44 t-dgit -wn --quilt=baredebian --dgit-view-save=split.p --new push
46 git merge-base --is-ancestor v${v%-*} split.p
47 git merge-base --is-ancestor HEAD split.p
48 set +e; git merge-base HEAD v${v%-*}; rc=$?; set -e; [ $rc = 1 ]
51 # t-pushed-good-* wants a clean tree to start with, but this
52 # workflow expects a mess
54 t-splitbrain-pushed-good-start
55 t-splitbrain-pushed-good--unpack
57 find . -mindepth 1 -maxdepth 1 \
63 t-splitbrain-pushed-good-end-made-dep14