Skip to content

Commit

Permalink
rebase -i: add another reword test
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
phillipwood authored and gitster committed Aug 23, 2021
1 parent 2be6b6f commit 0c164ae
Showing 1 changed file with 13 additions and 0 deletions.
13 changes: 13 additions & 0 deletions t/t3404-rebase-interactive.sh
Expand Up @@ -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/*" &&
Expand Down

0 comments on commit 0c164ae

Please sign in to comment.