path: root/tests
diff options
authorIan Jackson <>2019-07-17 02:04:12 +0100
committerIan Jackson <>2019-07-17 03:25:44 +0100
commitfdccbe592d6095c1f77fb25714e163c07ddd5342 (patch)
treee139f7e2eafce8e01b022da509c8ad6f7e823b0b /tests
parent9765d5b8002c33130ada5e85b43b88b993b9cff6 (diff)
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 <>
Diffstat (limited to 'tests')
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/lib-baredebian b/tests/lib-baredebian
index 3ef6569..61db972 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