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 d988321071e1aad4f40b187cea67e8078bff07d5..123a0d9f5f20a997559977a43b5380ed17bd5657 100755 (executable)
--- 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