rebase -i: remember the settings of -v, -s and -p when interrupted

diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index c25133699a97e3e0e453dd62101e6f35558f8ceb..43a6675caa3a57c0ad5a2b177d8b437e660525af 100755 (executable)
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@ -202,4 +202,14 @@ test_expect_success '--continue tries to commit' '
        git show HEAD | grep chouette
 '
 
+test_expect_success 'verbose flag is heeded, even after --continue' '
+       git reset --hard HEAD@{1} &&
+       test_tick &&
+       ! git rebase -v -i --onto new-branch1 HEAD^ &&
+       echo resolved > file1 &&
+       git add file1 &&
+       git rebase --continue > output &&
+       grep "^ file1 |    2 +-$" output
+'
+
 test_done