From: Ian Jackson Date: Wed, 17 Jul 2019 01:04:12 +0000 (+0100) Subject: test suite: baredebian: Move the quilt fixup forward X-Git-Tag: archive/debian/9.3~23 X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=fdccbe592d6095c1f77fb25714e163c07ddd5342;p=dgit.git test suite: baredebian: Move the quilt fixup forward We are going to split this function up so that our caller can do the push via tag-to-upload. No overall functional change. Signed-off-by: Ian Jackson --- diff --git a/tests/lib-baredebian b/tests/lib-baredebian index 3ef6569d..61db9722 100644 --- a/tests/lib-baredebian +++ b/tests/lib-baredebian @@ -56,12 +56,16 @@ baredebian-test-core () { git add debian/patches/. t-commit 'extra patch made with quilt' 1.0-2 + t-refs-same-start + t-ref-head + t-dgit -wn --quilt=$quiltmode --dgit-view-save=split.b quilt-fixup + t-ref-head + dpkg-buildpackage -uc -us --build=source # ^ Do this by hand here not because we expect users to do this # (rather than dgit build), but so that we can check that our # output is the same as users are used to. - 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 HEAD split.p