[PATCH v1 1/2] sequencer: don't abbreviate a command if it doesn't have a short form
- From
Alban Gruin <alban.gruin@gmail.com>
- Date
- Mar 30, 2020, 12:42 UTC
- Message-ID
- <20200330124236.6716-2-alban.gruin@gmail.com>
- In-Reply-To
- <20200330124236.6716-1-alban.gruin@gmail.com>
When the sequencer is requested to abbreviate commands, it will replace those that does not have a short form (eg. `noop') by a comment mark. `noop' serves no purpose, except when fast-forwarding (ie. by running `git rebase'). Removing it will break this command when `rebase.abbreviateCommands' is set to true.
This changes todo_list_to_strbuf() to check if a command has an actual short form, and to ignore it if not.
Signed-off-by: Alban Gruin <alban.gruin@gmail.com> --- sequencer.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/sequencer.c b/sequencer.c index 6fd2674632..79d0c5cb2e 100644 --- a/sequencer.c +++ b/sequencer.c @@ -1578,7 +1578,7 @@ static const char *command_to_string(const enum todo_command command) static char command_to_char(const enum todo_command command) { - if (command < TODO_COMMENT && todo_command_info[command].c) + if (command < TODO_COMMENT) return todo_command_info[command].c; return comment_line_char; } @@ -4963,6 +4963,8 @@ static void todo_list_to_strbuf(struct repository *r, struct todo_list *todo_lis max = num; for (item = todo_list->items, i = 0; i < max; i++, item++) { + char cmd; + /* if the item is not a command write it and continue */ if (item->command >= TODO_COMMENT) { strbuf_addf(buf, "%.*s\n", item->arg_len, @@ -4971,8 +4973,9 @@ static void todo_list_to_strbuf(struct repository *r, struct todo_list *todo_lis } /* add command to the buffer */ - if (flags & TODO_LIST_ABBREVIATE_CMDS) - strbuf_addch(buf, command_to_char(item->command)); + cmd = command_to_char(item->command); + if (flags & TODO_LIST_ABBREVIATE_CMDS && cmd) + strbuf_addch(buf, cmd); else strbuf_addstr(buf, command_to_string(item->command));
-- 2.25.0