On 26/06/2019 09:57, Phillip Wood wrote:
On 25/06/2019 21:44, Junio C Hamano wrote:
"Phillip Wood via GitGitGadget" <gitgitgadget@xxxxxxxxx> writes:
From: Phillip Wood <phillip.wood@xxxxxxxxxxxxx>
commit 4a72486de9 ("fix cherry-pick/revert status after commit",
2019-04-16) used parse_insn_line() to parse the first line of the todo
list to check if it was a pick or revert. However if the todo list is
left over from an old cherry-pick or revert and references a commit that
no longer exists then parse_insn_line() prints an error message which is
confusing for users [1]. Instead parse just the command name so that the
user is alerted to the presence of stale sequencer state by status
reporting that a cherry-pick or revert is in progress.
Or is it likely that such an effort would end up being wasted, as...
Note that we should not be leaving stale sequencer state lying around
(or at least not as often) after commit b07d9bfd17 ("commit/reset: try
to clean up sequencer state", 2019-04-16).
...this already happened?
Probably. It is still possible for the user to run checkout in the
middle of a cherry-pick and forget to finish it but if they're using a
prompt with git support it should tell them that a cherry-pick is in
progress as `git status` detects that it is.
Unfortunately it is not true that the prompt will see the in-progress
cherry-pick as it does not use git status - see
https://public-inbox.org/git/0f04fa2930d5cc7dfd2a5c5185573f7ecefa6055.1561990865.git.gitgitgadget@xxxxxxxxx/T/#u
for a fix
Best Wishes
Phillip
