diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2017-01-06 18:09:54 +0000 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2017-01-06 18:32:14 +0000 |
commit | 82ba0c6c552997a376968218d5e558fe491dfc6b (patch) | |
tree | 9281e3a94f65d0c6998e6e730561116366a6adae | |
parent | 1bdb8dcb25eb15fd197f6466c15105dccf11c52b (diff) |
test suite: New test for history-rewriting
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rw-r--r-- | debian/tests/control | 2 | ||||
-rwxr-xr-x | tests/tests/badcommit-rewrite | 36 |
2 files changed, 37 insertions, 1 deletions
diff --git a/debian/tests/control b/debian/tests/control index 7bd2a13..fa0d256 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -25,7 +25,7 @@ Tests-Directory: tests/tests Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential Restrictions: x-dgit-git-only -Tests: absurd-gitapply build-modes build-modes-asplit build-modes-gbp-asplit clone-clogsigpipe clone-gitnosuite clone-nogit debpolicy-dbretry debpolicy-newreject debpolicy-quilt-gbp distropatches-reject drs-clone-nogit drs-push-masterupdate drs-push-rejects dsd-clone-nogit dsd-divert fetch-localgitonly fetch-somegit-notlast gbp-orig gitconfig import-dsc import-native import-nonnative import-tarbomb inarchivecopy mismatches-contents mismatches-dscchanges multisuite newtag-clone-nogit oldnewtagalt oldtag-clone-nogit orig-include-exclude orig-include-exclude-chkquery overwrite-chkclog overwrite-junk overwrite-splitbrains overwrite-version push-buildproductsdir push-newpackage push-nextdgit quilt quilt-gbp quilt-gbp-build-modes quilt-singlepatch quilt-splitbrains rpush tag-updates test-list-uptodate trustingpolicy-replay unrepresentable version-opt +Tests: absurd-gitapply badcommit-rewrite build-modes build-modes-asplit build-modes-gbp-asplit clone-clogsigpipe clone-gitnosuite clone-nogit debpolicy-dbretry debpolicy-newreject debpolicy-quilt-gbp distropatches-reject drs-clone-nogit drs-push-masterupdate drs-push-rejects dsd-clone-nogit dsd-divert fetch-localgitonly fetch-somegit-notlast gbp-orig gitconfig import-dsc import-native import-nonnative import-tarbomb inarchivecopy mismatches-contents mismatches-dscchanges multisuite newtag-clone-nogit oldnewtagalt oldtag-clone-nogit orig-include-exclude orig-include-exclude-chkquery overwrite-chkclog overwrite-junk overwrite-splitbrains overwrite-version push-buildproductsdir push-newpackage push-nextdgit quilt quilt-gbp quilt-gbp-build-modes quilt-singlepatch quilt-splitbrains rpush tag-updates test-list-uptodate trustingpolicy-replay unrepresentable version-opt Tests-Directory: tests/tests Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential diff --git a/tests/tests/badcommit-rewrite b/tests/tests/badcommit-rewrite new file mode 100755 index 0000000..bcec8e6 --- /dev/null +++ b/tests/tests/badcommit-rewrite @@ -0,0 +1,36 @@ +#!/bin/bash +set -e +. tests/lib + +t-setup-import examplegit + +cd example + +suite=stable + +t-commit 'No changes, just send to stable' '' stable + +t-make-badcommit +git reset --hard $badcommit + +t-dgit -wgf build +t-dgit push --overwrite=1.2 stable +t-archive-process-incoming stable + +rstable=refs/remotes/dgit/dgit/stable + +t-dgit fetch stable +t-has-parent-or-is $rstable $badcommit + +cd $tmp/git/$p.git +${DGIT_BADCOMMIT_FIXUP} --real + +cd $tmp/$p +${DGIT_BADCOMMIT_FIXUP} --real + +t-dgit fetch stable + +t-expect-fail "child $rstable lacks parent $badcommit" \ +t-has-parent-or-is $rstable $badcommit + +t-ok |