rebase -i: add another reword test

None of the existing reword tests check that there are no uncommitted
changes when the editor is opened. Reuse the editor script from the
last commit to fix this omission.

Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index 66bcbbf9528cec9e372f39be80e23fa789aabbd2..d877872e8f4ad15f3af4ad8e2bf22948fae34a6c 100755 (executable)
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@ -839,6 +839,19 @@ test_expect_success 'reword' '
        git show HEAD~2 | grep "C changed"
 '
 
+test_expect_success 'no uncommited changes when rewording the todo list is reloaded' '
+       git checkout E &&
+       test_when_finished "git checkout @{-1}" &&
+       (
+               set_fake_editor &&
+               GIT_SEQUENCE_EDITOR="\"$PWD/fake-editor.sh\"" &&
+               export GIT_SEQUENCE_EDITOR &&
+               set_reword_editor &&
+               FAKE_LINES="reword 1 reword 2" git rebase -i C
+       ) &&
+       check_reworded_commits D E
+'
+
 test_expect_success 'rebase -i can copy notes' '
        git config notes.rewrite.rebase true &&
        git config notes.rewriteRef "refs/notes/*" &&