diff options
| -rw-r--r-- | debian/tests/control | 2 | ||||
| -rwxr-xr-x | tests/tests/forcesplit-linear | 45 |
2 files changed, 46 insertions, 1 deletions
diff --git a/debian/tests/control b/debian/tests/control index db40646..587cc29 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -68,7 +68,7 @@ Tests: trustingpolicy-replay Tests-Directory: tests/tests Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime, dput-ng -Tests: absurd-gitapply badcommit-rewrite build-modes build-modes-long build-modes-source checkout clone-clogsigpipe clone-gitnosuite clone-nogit debpolicy-dbretry debpolicy-newreject debpolicy-quilt-gbp defdistro-rpush defdistro-setup distropatches-reject dpkgsourceignores-correct drs-clone-nogit drs-push-masterupdate drs-push-rejects dsd-clone-nogit dsd-divert fetch-localgitonly fetch-somegit-notlast forcesplit-overwrite gbp-orig gitconfig gitworktree import-dsc import-linkorigs import-maintmangle import-native import-nonnative import-tarbomb inarchivecopy mismatches-contents mismatches-dscchanges multisuite orig-include-exclude orig-include-exclude-chkquery overwrite-chkclog overwrite-junk overwrite-splitbrains overwrite-version pbuilder protocol-compat push-buildproductsdir push-newpackage push-newrepeat push-nextdgit push-source push-source-with-changes quilt quilt-gbp quilt-gbp-build-modes quilt-singlepatch quilt-splitbrains quilt-useremail rpush rpush-quilt sourceonlypolicy tag-updates unrepresentable version-opt +Tests: absurd-gitapply badcommit-rewrite build-modes build-modes-long build-modes-source checkout clone-clogsigpipe clone-gitnosuite clone-nogit debpolicy-dbretry debpolicy-newreject debpolicy-quilt-gbp defdistro-rpush defdistro-setup distropatches-reject dpkgsourceignores-correct drs-clone-nogit drs-push-masterupdate drs-push-rejects dsd-clone-nogit dsd-divert fetch-localgitonly fetch-somegit-notlast forcesplit-linear forcesplit-overwrite gbp-orig gitconfig gitworktree import-dsc import-linkorigs import-maintmangle import-native import-nonnative import-tarbomb inarchivecopy mismatches-contents mismatches-dscchanges multisuite orig-include-exclude orig-include-exclude-chkquery overwrite-chkclog overwrite-junk overwrite-splitbrains overwrite-version pbuilder protocol-compat push-buildproductsdir push-newpackage push-newrepeat push-nextdgit push-source push-source-with-changes quilt quilt-gbp quilt-gbp-build-modes quilt-singlepatch quilt-splitbrains quilt-useremail rpush rpush-quilt sourceonlypolicy tag-updates unrepresentable version-opt Tests-Directory: tests/tests Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime diff --git a/tests/tests/forcesplit-linear b/tests/tests/forcesplit-linear new file mode 100755 index 0000000..4856d6a --- /dev/null +++ b/tests/tests/forcesplit-linear @@ -0,0 +1,45 @@ +#!/bin/bash +set -e +. tests/lib + +t-tstunt-parsechangelog +t-buildproductsdir-config + +t-archive example 1.0-1 +t-select-package example +t-git-none + +t-dgit clone $p +cd $p + +echo '/* More patch */' >>src.c +git add src.c + +t-commit 'More patch' 1.0-2 + +t-refs-same-start +t-ref-head +t-dgit --split-view push-source +t-ref-head + + +t-commit 'More more patch' 1.0-3 + +t-dgit --split-view --save-dgit-view=split.b quilt-fixup + +git reflog expire --expire=all refs/dgit-intern/quilt-cache +test "x$(git reflog refs/dgit-intern/quilt-cache)" = x + +t-refs-same-start +t-ref-head +t-dgit --split-view --save-dgit-view=split.p push-source +t-ref-head + +suite=sid + +t-splitbrain-pushed-good-start +t-splitbrain-pushed-good--unpack +t-splitbrain-rm-1-patch more-patch.patch +t-splitbrain-pushed-good-end-made-dep14 + +t-ok |