From e5ee33e8551fa934862b8cbe50693f4841e7dace Mon Sep 17 00:00:00 2001 From: Phillip Wood Date: Thu, 12 Aug 2021 13:42:09 +0000 Subject: rebase --continue: remove .git/MERGE_MSG If the user skips the final commit by removing all the changes from the index and worktree with 'git restore' (or read-tree) and then runs 'git rebase --continue' .git/MERGE_MSG is left behind. This will seed the commit message the next time the user commits which is not what we want to happen. Reported-by: Victor Gambier Signed-off-by: Phillip Wood Reviewed-by: Elijah Newren Signed-off-by: Junio C Hamano --- sequencer.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'sequencer.c') diff --git a/sequencer.c b/sequencer.c index 0bec01cf38..cb3c93c272 100644 --- a/sequencer.c +++ b/sequencer.c @@ -4717,6 +4717,9 @@ static int commit_staged_changes(struct repository *r, refs_delete_ref(get_main_ref_store(r), "", "CHERRY_PICK_HEAD", NULL, 0)) return error(_("could not remove CHERRY_PICK_HEAD")); + if (unlink(git_path_merge_msg(r)) && errno != ENOENT) + return error_errno(_("could not remove '%s'"), + git_path_merge_msg(r)); if (!final_fixup) return 0; } -- cgit v1.3