rebase -i: include MERGE_HEAD into files to clean up
Every once in a while, the interactive rebase makes sure that no stale files are lying around. These days, we need to include MERGE_HEAD into that set of files, as the `merge` command will generate them. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Schindelin committed
Nov 12, 2018 at 15:25 UTC
69c92209d2c4d33a25ed79a62a2170c0ff2059e8
1 file changed
+2
sequencer.c
+2
@@ -3459,6 +3459,7 @@ static int pick_commits(struct todo_list *todo_list, struct replay_opts *opts)
3459
unlink(rebase_path_author_script());
3460
unlink(rebase_path_stopped_sha());
3461
unlink(rebase_path_amend());
3462
+ unlink(git_path_merge_head(the_repository));
3463
delete_ref(NULL, "REBASE_HEAD", NULL, REF_NO_DEREF);
3464
3465
if (item->command == TODO_BREAK)
@@ -3829,6 +3830,7 @@ static int commit_staged_changes(struct replay_opts *opts,
3830
opts, flags))
3831
return error(_("could not commit staged changes."));
3832
unlink(rebase_path_amend());
3833
+ unlink(git_path_merge_head(the_repository));
3834
if (final_fixup) {
3835
unlink(rebase_path_fixup_msg());
3836
unlink(rebase_path_squash_msg());