mirror of
https://github.com/git/git
synced 2024-10-06 00:29:28 +00:00
sequencer: handle multi-byte comment characters when writing todo list
We already match multi-byte comment characters in parse_insn_line(), thanks to the previous commit, yielding a TODO_COMMENT entry. But in todo_list_to_strbuf(), we may call command_to_char() to convert that back into something we can output. We can't just return comment_line_char anymore, since it may require multiple bytes. Instead, we'll return "0" for this case, which is the same thing we'd return for a command which does not have a single-letter abbreviation (e.g., "revert" or "noop"). There is only a single caller of command_to_char(), and upon seeing "0" it falls back to outputting the full name via command_to_string(). So we can handle TODO_COMMENT there, returning the full string. Note that there are many other callers of command_to_string(), which will now behave differently if they pass TODO_COMMENT. But we would not expect that to happen; prior to this commit, the function just calls die() in this case. And looking at those callers, that makes sense; e.g., do_pick_commit() will only be called when servicing a pick command, and should never be called for a comment in the first place. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
2ec225d397
commit
7eb35e07c6
|
@ -1779,6 +1779,8 @@ static const char *command_to_string(const enum todo_command command)
|
|||
{
|
||||
if (command < TODO_COMMENT)
|
||||
return todo_command_info[command].str;
|
||||
if (command == TODO_COMMENT)
|
||||
return comment_line_str;
|
||||
die(_("unknown command: %d"), command);
|
||||
}
|
||||
|
||||
|
@ -1786,7 +1788,7 @@ static char command_to_char(const enum todo_command command)
|
|||
{
|
||||
if (command < TODO_COMMENT)
|
||||
return todo_command_info[command].c;
|
||||
return comment_line_char;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int is_noop(const enum todo_command command)
|
||||
|
|
Loading…
Reference in a new issue