diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2019-06-29 13:33:55 +0100 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2019-06-29 13:51:06 +0100 |
| commit | 1d679b1f9e9ad664e898dfb53692ebbafea52f95 (patch) | |
| tree | 8d63ae5fc611a589a6034d673beee3ba28418703 /tests/tests/baredebian-push | |
| parent | 16a5072a1f86be398577336e569b8c16a84d0560 (diff) | |
test suite: baredebian-push: Check that history is roughly right
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'tests/tests/baredebian-push')
| -rwxr-xr-x | tests/tests/baredebian-push | 4 |
1 files changed, 4 insertions, 0 deletions
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 |