Skip to content

Commit dc7f55c

Browse files
sbeyergitster
authored andcommitted
t3404: Add test case for aborted --continue after "edit"
Add a test case for the bugfix introduced by commit 8beb1f3 "git-rebase-interactive: do not squash commits on abort". Signed-off-by: Stephan Beyer <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 944019c commit dc7f55c

File tree

1 file changed

+15
-0
lines changed

1 file changed

+15
-0
lines changed

t/t3404-rebase-interactive.sh

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -373,6 +373,21 @@ test_expect_success '--continue tries to commit, even for "edit"' '
373373
test $parent = $(git rev-parse HEAD^)
374374
'
375375

376+
test_expect_success 'aborted --continue does not squash commits after "edit"' '
377+
old=$(git rev-parse HEAD) &&
378+
test_tick &&
379+
FAKE_LINES="edit 1" git rebase -i HEAD^ &&
380+
echo "edited again" > file7 &&
381+
git add file7 &&
382+
(
383+
FAKE_COMMIT_MESSAGE=" " &&
384+
export FAKE_COMMIT_MESSAGE &&
385+
test_must_fail git rebase --continue
386+
) &&
387+
test $old = $(git rev-parse HEAD) &&
388+
git rebase --abort
389+
'
390+
376391
test_expect_success 'rebase a detached HEAD' '
377392
grandparent=$(git rev-parse HEAD~2) &&
378393
git checkout $(git rev-parse HEAD) &&

0 commit comments

Comments
 (0)