mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
status: do not report errors in sequencer/todo
commit4a72486de9
("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 commitb07d9bfd17
("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>
This commit is contained in:
parent
3e81bccdf3
commit
ed5b1ca10b
24
sequencer.c
24
sequencer.c
|
@ -2177,34 +2177,26 @@ static int parse_insn_line(struct repository *r, struct todo_item *item,
|
|||
|
||||
int sequencer_get_last_command(struct repository *r, enum replay_action *action)
|
||||
{
|
||||
struct todo_item item;
|
||||
char *eol;
|
||||
const char *todo_file;
|
||||
const char *todo_file, *bol;
|
||||
struct strbuf buf = STRBUF_INIT;
|
||||
int ret = -1;
|
||||
int ret = 0;
|
||||
|
||||
todo_file = git_path_todo_file();
|
||||
if (strbuf_read_file(&buf, todo_file, 0) < 0) {
|
||||
if (errno == ENOENT)
|
||||
if (errno == ENOENT || errno == ENOTDIR)
|
||||
return -1;
|
||||
else
|
||||
return error_errno("unable to open '%s'", todo_file);
|
||||
}
|
||||
eol = strchrnul(buf.buf, '\n');
|
||||
if (buf.buf != eol && eol[-1] == '\r')
|
||||
eol--; /* strip Carriage Return */
|
||||
if (parse_insn_line(r, &item, buf.buf, buf.buf, eol))
|
||||
goto fail;
|
||||
if (item.command == TODO_PICK)
|
||||
bol = buf.buf + strspn(buf.buf, " \t\r\n");
|
||||
if (is_command(TODO_PICK, &bol) && (*bol == ' ' || *bol == '\t'))
|
||||
*action = REPLAY_PICK;
|
||||
else if (item.command == TODO_REVERT)
|
||||
else if (is_command(TODO_REVERT, &bol) &&
|
||||
(*bol == ' ' || *bol == '\t'))
|
||||
*action = REPLAY_REVERT;
|
||||
else
|
||||
goto fail;
|
||||
ret = -1;
|
||||
|
||||
ret = 0;
|
||||
|
||||
fail:
|
||||
strbuf_release(&buf);
|
||||
|
||||
return ret;
|
||||
|
|
|
@ -798,6 +798,22 @@ EOF
|
|||
test_i18ncmp expected actual
|
||||
'
|
||||
|
||||
test_expect_success 'status shows cherry-pick with invalid oid' '
|
||||
mkdir .git/sequencer &&
|
||||
test_write_lines "pick invalid-oid" >.git/sequencer/todo &&
|
||||
git status --untracked-files=no >actual 2>err &&
|
||||
git cherry-pick --quit &&
|
||||
test_must_be_empty err &&
|
||||
test_i18ncmp expected actual
|
||||
'
|
||||
|
||||
test_expect_success 'status does not show error if .git/sequencer is a file' '
|
||||
test_when_finished "rm .git/sequencer" &&
|
||||
test_write_lines hello >.git/sequencer &&
|
||||
git status --untracked-files=no 2>err &&
|
||||
test_must_be_empty err
|
||||
'
|
||||
|
||||
test_expect_success 'status showing detached at and from a tag' '
|
||||
test_commit atag tagging &&
|
||||
git checkout atag &&
|
||||
|
|
Loading…
Reference in a new issue