diff options
author | Phillip Wood <phillip.wood@dunelm.org.uk> | 2019-06-27 07:12:46 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-06-27 10:31:02 -0700 |
commit | ed5b1ca10b2644f1af3bdfa3da32c67f4df1aa46 (patch) | |
tree | 85c2843beda7c0002761d6abea7b4cef422763d6 /mailmap.h | |
parent | sequencer: factor out todo command name parsing (diff) | |
download | tgif-ed5b1ca10b2644f1af3bdfa3da32c67f4df1aa46.tar.xz |
status: do not report errors in sequencer/todo
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.
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). However the user may still
have stale state that predates that commit.
Also avoid printing an error message if for some reason the user has a
file called `sequencer` in $GIT_DIR.
[1] https://public-inbox.org/git/3bc58c33-4268-4e7c-bf1a-fe349b3cb037@www.fastmail.com/
Reported-by: Espen Antonsen <espen@inspired.no>
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mailmap.h')
0 files changed, 0 insertions, 0 deletions