From: Jeff King <peff@peff.net>
To: Todd Zullinger <tmz@pobox.com>
Cc: git@vger.kernel.org, "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: Re: [BUG] completion.commands does not remove multiple commands
Date: Thu, 28 Feb 2019 18:05:06 -0500 [thread overview]
Message-ID: <20190228230506.GA20625@sigill.intra.peff.net> (raw)
In-Reply-To: <20190228223123.GZ16125@zaya.teonanacatl.net>
On Thu, Feb 28, 2019 at 05:31:23PM -0500, Todd Zullinger wrote:
> Hi,
>
> I was playing with the completion.commands config added in
> 6532f3740b ("completion: allow to customize the completable
> command list", 2018-05-20) and noticed an issue removing
> multiple commands.
>
> I wanted to remove completion for cherry and mergetool, so I
> added them both to the config:
>
> git config completion.commands "-cherry -mergetool"
>
> But git still completes cherry in this case, only removing
> mergetool. Swapping the items in the config yields the
> opposite result (cherry is removed and mergetool is not).
I can reproduce your problem, though the test you included passes for me
even with the current tip of master. I suspect this is the problem:
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);
though I can't help but wonder if the whole thing would be simpler using
string_list_split().
-Peff
next prev parent reply other threads:[~2019-02-28 23:05 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-28 22:31 [BUG] completion.commands does not remove multiple commands Todd Zullinger
2019-02-28 23:05 ` Jeff King [this message]
2019-03-01 17:34 ` Todd Zullinger
2019-03-01 18:30 ` Jeff King
2019-03-01 22:15 ` Todd Zullinger
2019-03-01 23:08 ` Jeff King
2019-03-02 1:08 ` Duy Nguyen
2019-03-02 1:18 ` Junio C Hamano
2019-03-02 2:40 ` Todd Zullinger
2019-03-02 4:07 ` SZEDER Gábor
2019-03-03 1:34 ` Todd Zullinger
2019-03-03 17:06 ` Jeff King
2019-03-01 17:34 ` [PATCH 1/3] doc: note config file restrictions for completion.commands Todd Zullinger
2019-03-17 13:12 ` Duy Nguyen
2019-03-17 18:16 ` [PATCH v2 0/4] completion.commands: fix multiple command removals Todd Zullinger
2019-03-17 18:16 ` [PATCH v2 1/4] git: read local config in --list-cmds Todd Zullinger
2019-03-18 9:41 ` Duy Nguyen
2019-03-20 18:03 ` [PATCH v3 0/4] completion.commands: fix multiple command removals Todd Zullinger
2019-03-21 2:58 ` Junio C Hamano
2019-03-21 17:18 ` Todd Zullinger
2019-03-21 9:45 ` Duy Nguyen
2019-03-20 18:03 ` [PATCH v3 1/4] git: read local config in --list-cmds Todd Zullinger
2019-03-20 18:03 ` [PATCH v3 2/4] t9902: test multiple removals via completion.commands Todd Zullinger
2019-03-20 18:03 ` [PATCH v3 3/4] completion: fix multiple command removals Todd Zullinger
2019-03-20 18:03 ` [PATCH v3 4/4] completion: use __git when calling --list-cmds Todd Zullinger
2019-03-17 18:16 ` [PATCH v2 2/4] t9902: test multiple removals via completion.commands Todd Zullinger
2019-03-17 18:16 ` [PATCH v2 3/4] completion: fix multiple command removals Todd Zullinger
2019-03-17 18:16 ` [PATCH v2 4/4] completion: use __git when calling --list-cmds Todd Zullinger
2019-03-01 17:34 ` [PATCH 2/3] t9902: test multiple removals via completion.commands Todd Zullinger
2019-03-01 18:22 ` Eric Sunshine
2019-03-01 20:50 ` SZEDER Gábor
2019-03-01 21:56 ` Todd Zullinger
2019-03-01 17:34 ` [PATCH 3/3] completion: fix multiple command removals Todd Zullinger
2019-03-01 18:16 ` Jeff King
2019-02-28 23:05 ` [BUG] completion.commands does not remove multiple commands SZEDER Gábor
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190228230506.GA20625@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=pclouds@gmail.com \
--cc=tmz@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).