rebase -i: be careful to wrap up fixup/squash chains
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Fri, 31 Aug 2018 23:45:04 +0000 (16:45 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 4 Sep 2018 15:59:33 +0000 (08:59 -0700)
When an interactive rebase was stopped at the end of a fixup/squash
chain, the user might have edited the commit manually before continuing
(with either `git rebase --skip` or `git rebase --continue`, it does not
really matter which).

We need to be very careful to wrap up the fixup/squash chain also in
this scenario: otherwise the next fixup/squash chain would try to pick
up where the previous one was left.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
sequencer.c
t/t3415-rebase-autosquash.sh

index 4034c04..cccec6b 100644 (file)
@@ -3438,9 +3438,20 @@ static int commit_staged_changes(struct replay_opts *opts,
                 * the commit message and if there was a squash, let the user
                 * edit it.
                 */
-               if (is_clean && !oidcmp(&head, &to_amend) &&
-                   opts->current_fixup_count > 0 &&
-                   file_exists(rebase_path_stopped_sha())) {
+               if (!is_clean || !opts->current_fixup_count)
+                       ; /* this is not the final fixup */
+               else if (oidcmp(&head, &to_amend) ||
+                        !file_exists(rebase_path_stopped_sha())) {
+                       /* was a final fixup or squash done manually? */
+                       if (!is_fixup(peek_command(todo_list, 0))) {
+                               unlink(rebase_path_fixup_msg());
+                               unlink(rebase_path_squash_msg());
+                               unlink(rebase_path_current_fixups());
+                               strbuf_reset(&opts->current_fixups);
+                               opts->current_fixup_count = 0;
+                       }
+               } else {
+                       /* we are in a fixup/squash chain */
                        const char *p = opts->current_fixups.buf;
                        int len = opts->current_fixups.len;
 
index 7d5ea34..13f5688 100755 (executable)
@@ -330,7 +330,7 @@ test_expect_success 'wrapped original subject' '
        test $base = $parent
 '
 
-test_expect_failure 'abort last squash' '
+test_expect_success 'abort last squash' '
        test_when_finished "test_might_fail git rebase --abort" &&
        test_when_finished "git checkout master" &&