From: Duy Nguyen <pclouds@gmail.com>
To: Todd Zullinger <tmz@pobox.com>
Cc: "Jeff King" <peff@peff.net>,
"Git Mailing List" <git@vger.kernel.org>,
"Junio C Hamano" <gitster@pobox.com>,
"SZEDER Gábor" <szeder.dev@gmail.com>,
"Eric Sunshine" <sunshine@sunshineco.com>
Subject: Re: [PATCH v2 1/4] git: read local config in --list-cmds
Date: Mon, 18 Mar 2019 16:41:13 +0700 [thread overview]
Message-ID: <CACsJy8DiQwmAKMruOAO4roPbiRTvt5TESBTd682hTwkZjcoj2Q@mail.gmail.com> (raw)
In-Reply-To: <20190317181620.26727-2-tmz@pobox.com>
On Mon, Mar 18, 2019 at 1:16 AM Todd Zullinger <tmz@pobox.com> wrote:
>
> From: Jeff King <peff@peff.net>
>
> Normally code that is checking config before we've decided to do
> setup_git_directory() would use read_early_config(), which uses
> discover_git_directory() to tentatively see if we're in a repo,
> and if so to add it to the config sequence.
>
> But list_cmds() uses the caching configset mechanism which
> rightly does not use read_early_config(), because it has no
> idea if it's being called early.
>
> Call setup_git_directory_gently() so we can pick up repo-level
> config (like completion.commands).
>
> Signed-off-by: Jeff King <peff@peff.net>
> ---
> git.c | 7 +++++++
> 1 file changed, 7 insertions(+)
>
> diff --git a/git.c b/git.c
> index 2dd588674f..10e49d79f6 100644
> --- a/git.c
> +++ b/git.c
> @@ -62,6 +62,13 @@ static int list_cmds(const char *spec)
> {
> struct string_list list = STRING_LIST_INIT_DUP;
> int i;
> + int nongit;
> +
> + /*
> + * Set up the repository so we can pick up any repo-level config (like
> + * completion.commands).
> + */
> + setup_git_directory_gently(&nongit);
This gave me a pause because we could try to find .git more than
necessary (e.g. when --list-cmds is requested without "config"). But I
don't think that happens often enough to be worried about.
It also subtly changes list_aliases() code flow, because the
read_early_config() call inside will use the already-discovered gitdir
here instead of trying to rediscover. So, everything is still fine.
You probably want to drop the comment block about repository setup
inside list_cmds_by_config() too.
>
> while (*spec) {
> const char *sep = strchrnul(spec, ',');
--
Duy
next prev parent reply other threads:[~2019-03-18 9:41 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
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 [this message]
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=CACsJy8DiQwmAKMruOAO4roPbiRTvt5TESBTd682hTwkZjcoj2Q@mail.gmail.com \
--to=pclouds@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
--cc=sunshine@sunshineco.com \
--cc=szeder.dev@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).