Re: [PATCH v4 0/7] rebase -i: impove handling of failed commands
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Sep 6, 2023, 21:01 UTC
- Message-ID
- <xmqqedjbm2xl.fsf@gitster.g>
- In-Reply-To
- <pull.1492.v4.git.1694013771.gitgitgadget@gmail.com>
"Phillip Wood via GitGitGadget" <gitgitgadget@gmail.com> writes:
Show 35 quoted lines
> This series fixes several bugs in the way we handle a commit cannot be > picked because it would overwrite an untracked file. > > * after a failed pick "git rebase --continue" will happily commit any > staged changes even though no commit was picked. > > * the commit of the failed pick is recorded as rewritten even though no > commit was picked. > > * the "done" file used by "git status" to show the recently executed > commands contains an incorrect entry. > > Thanks to Eric, Glen and Junio for their comments on v2. Here are the > changes since v2: > > Patch 1 - Reworded the commit message. > > Patch 2 - Reworded the commit message, added a test and fixed error message > pointed out by Glen. > > Patch 3 - New cleanup. > > Patch 4 - Reworded the commit message, now only increments > todo_list->current if there is no error. > > Patch 5 - Swapped with next patch. Reworded the commit message, stopped > testing implementation (suggested by Glen). Expanded post-rewrite hook test. > > Patch 6 - Reworded the commit message, now uses the message file rather than > the author script to check if "rebase --continue" should commit staged > changes. Junio suggested using a separate file for this but I think that > would end up being more involved as we'd need to be careful about creating > and removing it. > > Patch 7 - Reworded the commit message.
Thanks. This version looks good to me (although I am not as familiar with this part of the codebase as others on the Cc: line).