summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-08-04 14:06:03 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-08-04 14:06:03 +0100
commitcaa7cbcf78c1b936d5300f34c83a6b33ebebf50c (patch)
treefaee3c94c0a16d049ce1437feda550847707a9c0 /tests
parentf4cc9bfd072ea021caf9ae97d56d29c2ed01773e (diff)
test suite: gdr-subcommands: Test scrap
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'tests')
-rwxr-xr-xtests/tests/gdr-subcommands10
1 files changed, 10 insertions, 0 deletions
diff --git a/tests/tests/gdr-subcommands b/tests/tests/gdr-subcommands
index 0b07372..c48fb5d 100755
--- a/tests/tests/gdr-subcommands
+++ b/tests/tests/gdr-subcommands
@@ -35,10 +35,12 @@ mix-it
git checkout -b unstitched-laundered master
mix-it
+git branch before-unstitch/unstitched-laundered
t-git-debrebase
t-gdr-good laundered
git checkout -b unstitched-mixed master
+git branch before-unstitch/unstitched-mixed
t-git-debrebase
mix-it
@@ -173,6 +175,12 @@ make_check () {
f*)
t-has-ancestor HEAD refs/heads/$before
;;
+ Z*)
+ t-refs-same-start
+ t-refs-same refs/heads/$work
+ t-refs-same refs/heads/before-unstitch/$startbranch
+ t-ref-head
+ ;;
*)
fail "$1"
;;
@@ -195,6 +203,7 @@ subcmd stitch Ns Nu Sltf Stf
subcmd prepush Ns Nu Sltf Stf
subcmd quick ns Sl Sltf Sl
subcmd conclude "$Ec" "$Ec" Sltf Sl
+subcmd scrap Ns Ns Z Z
subcmd make-patches sPft "$Ep" uPft "$Ep"
#subcmd dgit-upload-hook Psft "$Ep" SPft "$Ep"
#
@@ -215,6 +224,7 @@ subcmd make-patches sPft "$Ep" uPft "$Ep"
# V ffq-prev remains unchanged; implies also u
# s result is stitched, debrebase-last exists and is unchanged
# S result is stitch just made, remaining letters apply to result~
+# Z result is rewind to before changes made
#
# P result is add-patches, remaining letters apply to result~
#