diff options
| author | Jeff King <peff@peff.net> | 2019-03-20 19:03:28 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-03-21 03:52:11 +0100 |
| commit | 057ab54b6646fbdabc8c953299f218081ff67456 (patch) | |
| tree | f04384200663b1ef50f251c5588459bbbd6aa830 | |
| parent | t9902: test multiple removals via completion.commands (diff) | |
| download | git-057ab54b6646fbdabc8c953299f218081ff67456.tar.xz git-057ab54b6646fbdabc8c953299f218081ff67456.zip | |
completion: fix multiple command removals
Commit 6532f3740b ("completion: allow to customize the completable
command list", 2018-05-20) tried to allow multiple space-separated
entries in completion.commands. To do this, it copies each parsed token
into a strbuf so that the result is NUL-terminated.
However, for tokens starting with "-", it accidentally passes the
original non-terminated string, meaning that only the final one worked.
Switch to using the strbuf.
Reported-by: Todd Zullinger <tmz@pobox.com>
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | help.c | 4 | ||||
| -rwxr-xr-x | t/t9902-completion.sh | 2 |
2 files changed, 3 insertions, 3 deletions
@@ -386,8 +386,8 @@ void list_cmds_by_config(struct string_list *list) const char *p = strchrnul(cmd_list, ' '); strbuf_add(&sb, cmd_list, p - cmd_list); - if (*cmd_list == '-') - string_list_remove(list, cmd_list + 1, 0); + if (sb.buf[0] == '-') + string_list_remove(list, sb.buf + 1, 0); else string_list_insert(list, sb.buf); strbuf_release(&sb); diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh index 3d1859f303..43cf313a1c 100755 --- a/t/t9902-completion.sh +++ b/t/t9902-completion.sh @@ -1484,7 +1484,7 @@ test_expect_success 'git --help completion' ' test_completion "git --help core" "core-tutorial " ' -test_expect_failure 'completion.commands removes multiple commands' ' +test_expect_success 'completion.commands removes multiple commands' ' test_config completion.commands "-cherry -mergetool" && git --list-cmds=list-mainporcelain,list-complete,config >out && ! grep -E "^(cherry|mergetool)$" out |