Re: [PATCH v2 3/3] rebase --continue: remove .git/MERGE_MSG
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Aug 13, 2021, 23:01 UTC
- Message-ID
- <xmqqa6lluexv.fsf@gitster.g>
- In-Reply-To
- <028c9dfc460b6c00bf481017a07a2a6d37780a76.1628775729.git.gitgitgadget@gmail.com>
"Phillip Wood via GitGitGadget" <gitgitgadget@gmail.com> writes:
Show 7 quoted lines
> From: Phillip Wood <phillip.wood@dunelm.org.uk> > > 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.
I just remembered that "git rebase --skip" option exists. Would it have the same issue if used at the last step?
[Footnote]
I am not saying that it is an error to use "git restore HEAD . && git rebase --continue" when you'd usually use "git rebase --skip".
Nuking the difference the working tree files and the index has relative to HEAD and telling the machinery to continue gives the signal that the "conflict resolution" happened to have resulted in an empty change, which should yield the same resulting history as "git rebase --skip" would, because the resulting empty change should be dropped (unless --empty=keep is in effect, that is).