Merge branch 'tz/gpg-test-fix'

diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index c98f64eb2d288843bfe8123bdac3176bda4b976c..52fa41c707699692db1f387263774c93560e6663 100755 (executable)
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@ -175,6 +175,11 @@ test_expect_success 'rebase -i with exec of inexistent command' '
        ! grep "Maybe git-rebase is broken" actual
 '
 
+test_expect_success 'implicit interactive rebase does not invoke sequence editor' '
+       test_when_finished "git rebase --abort ||:" &&
+       GIT_SEQUENCE_EDITOR="echo bad >" git rebase -x"echo one" @^
+'
+
 test_expect_success 'no changes are a nop' '
        git checkout branch2 &&
        set_fake_editor &&