X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Ftests%2Fgdr-subcommands;h=982515685145b6db685d5cb804163e0be344ce6f;hb=2f538edde0ceb8dc747dd481e2e80ab2f36555d7;hp=9d50b6c04f7db9134b4752ae1565854577be6bcc;hpb=6b3cdcf0d595efd96bc8c4220df87f7fd5aaef76;p=dgit.git

diff --git a/tests/tests/gdr-subcommands b/tests/tests/gdr-subcommands
index 9d50b6c0..98251568 100755
--- a/tests/tests/gdr-subcommands
+++ b/tests/tests/gdr-subcommands
@@ -63,22 +63,40 @@ subcmd () {
 		before=before-$work
 		git branch $before
 
+		local xopts=''
+
 		case "$checkletters" in
 		XX*)
 			fail "$checkletters" # for debugging
 			;;
+		esac
+
+		case "$checkletters" in
+		X*)
+			t-expect-fail E:'snags: [0-9]* blockers' \
+			t-git-debrebase $xopts $subcmd
+			xopts+=' --force'
+			next_checkletter
+			;;
+		esac
+
+		case "$checkletters" in
 		N*)
 			t-expect-fail E:. \
-			t-git-debrebase $subcmd
-			t-git-debrebase --noop-ok $subcmd
+			t-git-debrebase $xopts $subcmd
+			xopts+=' --noop-ok'
+			next_checkletter
 			;;
+		esac
+
+		case "$checkletters" in
 		[EF]:*)
 			t-expect-fail "$checkletters" \
-			t-git-debrebase $subcmd
+			t-git-debrebase $xopts $subcmd
 			continue
 			;;
 		*)
-			t-git-debrebase $subcmd
+			t-git-debrebase $xopts $subcmd
 			;;
 		esac
 
@@ -182,6 +200,9 @@ subcmd	make-patches	sPft	"$Ep"	uPft	"$Ep"
 #   E:$pat	} this is an error (must come first)
 #   F:$pat	} arg is passed to expect-fail
 #
+#   X		should fail due to snags, but succeed when forced
+#   XX		crash out of script for manual debugging
+#
 #   N		this is a noop, error unless --noop-ok
 #   n		this is a silent noop
 # both of these imply tf; but, specify also one of   u s