From 1d679b1f9e9ad664e898dfb53692ebbafea52f95 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 29 Jun 2019 13:33:55 +0100 Subject: test suite: baredebian-push: Check that history is roughly right Signed-off-by: Ian Jackson --- tests/tests/baredebian-push | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'tests') diff --git a/tests/tests/baredebian-push b/tests/tests/baredebian-push index 7dfee4b..a559312 100755 --- a/tests/tests/baredebian-push +++ b/tests/tests/baredebian-push @@ -48,6 +48,10 @@ dpkg-buildpackage -uc -us --build=source t-dgit -wn --quilt=baredebian --dgit-view-save=split.b quilt-fixup t-dgit -wn --quilt=baredebian --dgit-view-save=split.p --new push +git merge-base --is-ancestor v${v%-*} split.p +git merge-base --is-ancestor HEAD split.p +set +e; git merge-base HEAD v${v%-*}; rc=$?; set -e; [ $rc = 1 ] + git clean -xdff # t-pushed-good-* wants a clean tree to start with, but this # workflow expects a mess -- cgit v1.2.3