mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-28 17:26:12 +02:00
Code

rebase -i: be careful to wrap up fixup/squash chains 

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>
This commit is contained in:
Johannes Schindelin 2018-08-31 16:45:04 -07:00 committed by Junio C Hamano
parent 2f3eb68f10
commit 10d2f35436
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sequencer.c
View 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;

2
t/t3415-rebase-autosquash.sh
View File

@ -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" &&