From: Brandon Williams <bmwill@google.com>
To: Johannes Schindelin <johannes.schindelin@gmx.de>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH 3/9] help: use early config when autocorrecting aliases
Date: Wed, 7 Jun 2017 10:51:22 -0700 [thread overview]
Message-ID: <20170607175122.GC110638@google.com> (raw)
In-Reply-To: <d7b77cbd688b7536aebee49df652af594d2a1293.1496851544.git.johannes.schindelin@gmx.de>
On 06/07, Johannes Schindelin wrote:
> Git has this feature where suggests similar commands (including aliases)
nit: s/where/which/
> in case that the user specified an unknown command.
s/that//
>
> This feature currently relies on a side effect of the way we expand
> aliases right now: when a command is not a builtin, we use the regular
> config machinery (meaning: discovering the .git/ directory and
> initializing global state such as the config cache) to see whether the
> command refers to an alias.
>
> However, we will change the way aliases are expanded in the next
> commits, to use the early config instead. That means that the
> autocorrect feature can no longer discover the available aliases by
> looking at the config cache (because it has not yet been initialized).
>
> So let's just use the early config machinery instead.
>
> This is slightly less performant than the previous way, as the early
> config is used *twice*: once to see whether the command refers to an
> alias, and then to see what aliases are most similar. However, this is
> hardly a performance-critical code path, so performance is less important
> here.
Agreed, and it is more important to be correct than performant.
>
> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> ---
> help.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/help.c b/help.c
> index db7f3d79a01..b44c55ec2da 100644
> --- a/help.c
> +++ b/help.c
> @@ -289,7 +289,7 @@ const char *help_unknown_cmd(const char *cmd)
> memset(&other_cmds, 0, sizeof(other_cmds));
> memset(&aliases, 0, sizeof(aliases));
>
> - git_config(git_unknown_cmd_config, NULL);
> + read_early_config(git_unknown_cmd_config, NULL);
>
> load_command_list("git-", &main_cmds, &other_cmds);
>
> --
> 2.13.0.windows.1.460.g13f583bedb5
>
>
--
Brandon Williams
next prev parent reply other threads:[~2017-06-07 17:51 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-07 16:06 [PATCH 0/9] Avoid problem where git_dir is set after alias expansion Johannes Schindelin
2017-06-07 16:06 ` [PATCH 1/9] discover_git_directory(): avoid setting invalid git_dir Johannes Schindelin
2017-06-07 17:45 ` Brandon Williams
2017-06-08 10:00 ` Johannes Schindelin
2017-06-07 16:06 ` [PATCH 2/9] config: report correct line number upon error Johannes Schindelin
2017-06-09 17:01 ` Junio C Hamano
2017-06-07 16:06 ` [PATCH 3/9] help: use early config when autocorrecting aliases Johannes Schindelin
2017-06-07 17:51 ` Brandon Williams [this message]
2017-06-08 10:02 ` Johannes Schindelin
2017-06-09 17:05 ` Junio C Hamano
2017-06-07 16:06 ` [PATCH 4/9] read_early_config(): optionally return the worktree's top-level directory Johannes Schindelin
2017-06-07 18:13 ` Brandon Williams
2017-06-08 10:20 ` Johannes Schindelin
2017-06-08 14:46 ` Brandon Williams
2017-06-08 15:30 ` Johannes Schindelin
2017-06-08 16:32 ` Brandon Williams
2017-06-08 18:52 ` Johannes Schindelin
2017-06-08 18:54 ` Brandon Williams
2017-06-07 16:06 ` [PATCH 5/9] t1308: relax the test verifying that empty alias values are disallowed Johannes Schindelin
2017-06-07 18:15 ` Brandon Williams
2017-06-08 10:22 ` Johannes Schindelin
2017-06-08 14:47 ` Brandon Williams
2017-06-10 1:28 ` Junio C Hamano
2017-06-07 16:06 ` [PATCH 6/9] t7006: demonstrate a problem with aliases in subdirectories Johannes Schindelin
2017-06-07 16:06 ` [PATCH 7/9] alias_lookup(): optionally return top-level directory Johannes Schindelin
2017-06-07 16:07 ` [PATCH 8/9] Use the early config machinery to expand aliases Johannes Schindelin
2017-06-07 18:26 ` Brandon Williams
2017-06-08 10:25 ` Johannes Schindelin
2017-06-08 14:51 ` Brandon Williams
2017-06-10 1:33 ` Junio C Hamano
2017-06-07 16:09 ` [PATCH 0/9] Avoid problem where git_dir is set after alias expansion Johannes Schindelin
2017-06-07 18:30 ` Brandon Williams
2017-06-08 10:27 ` Johannes Schindelin
2017-06-08 16:33 ` Brandon Williams
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170607175122.GC110638@google.com \
--to=bmwill@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=johannes.schindelin@gmx.de \
/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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.