From: Jeff King <peff@xxxxxxxx>
6532f3740b ("completion: allow to customize the completable
command list", 2018-05-20) added the completion.commands config
variable.
The documentation states multiple commands may be added,
separated by spaces. Adding multiple commands to remove fails,
only removing the last command in the config.
Fix multiple command removals.
Signed-off-by: Jeff King <peff@xxxxxxxx>
---
Jeff,
The commit message could probably be worded better, particularly since it's
forged in your name.
help.c | 4 ++--
t/t9902-completion.sh | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/help.c b/help.c
index 520c9080e8..026f881715 100644
--- a/help.c
+++ b/help.c
@@ -393,8 +393,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 dd11bb660d..d7daa1ca92 100755
--- a/t/t9902-completion.sh
+++ b/t/t9902-completion.sh
@@ -1483,7 +1483,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' '
echo cherry-pick >expected &&
test_config_global completion.commands "-cherry -mergetool" &&
git --list-cmds=list-mainporcelain,list-complete,config |
