test suite: baredebian-push: Check that history is roughly right

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/tests/tests/baredebian-push b/tests/tests/baredebian-push
index 7dfee4bc47bcbdb98140e3df58ae73b6e081906e..a5593123d0fcb3d9a1d834405b58d1905fbd9370 100755 (executable)
--- 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