From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 16 Jun 2018 22:17:34 +0000 (+0100)
Subject: git-debrebase: test suite: gdr-subcommands: honour new $xopts
X-Git-Tag: archive/debian/5.0~30
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=1951e44b06b3e179b508bcd139d8758c250e35e2;hp=5339eea5306868d16d52a8b14358f5100b9358f0;ds=inline

git-debrebase: test suite: gdr-subcommands: honour new $xopts

This allows the introduction of chaining checkletters which modify
subsequent attempts.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/tests/tests/gdr-subcommands b/tests/tests/gdr-subcommands
index d9883210..123a0d9f 100755
--- a/tests/tests/gdr-subcommands
+++ b/tests/tests/gdr-subcommands
@@ -63,22 +63,24 @@ subcmd () {
 		before=before-$work
 		git branch $before
 
+		local xopts=''
+
 		case "$checkletters" in
 		XX*)
 			fail "$checkletters" # for debugging
 			;;
 		N*)
 			t-expect-fail E:. \
-			t-git-debrebase $subcmd
-			t-git-debrebase --noop-ok $subcmd
+			t-git-debrebase $xopts $subcmd
+			t-git-debrebase $xopts --noop-ok $subcmd
 			;;
 		[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