Re: [PATCH v2 3/4] config: clarify meaning of command line scoping
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Jan 9, 2020, 19:13 UTC
- Message-ID
- <xmqqh814zbm0.fsf@gitster-ct.c.googlers.com>
- In-Reply-To
- <82252735467d876b4726f512a02cc44d271696ca.1578565001.git.gitgitgadget@gmail.com>
"Matthew Rogers via GitGitGadget" <gitgitgadget@gmail.com> writes:
Show 6 quoted lines
> From: Matthew Rogers <mattr94@gmail.com> > > CONFIG_SCOPE_CMDLINE is generally used in the code to refer to config > values passed in via the -c option. This is a little bit too specific > as there are other methods to pass config values so that the last for a > single command (namely --file and --blob).
Sorry, but I cannot parse this, especially around "so that the last for ..." part.
> As the "visibility" of config > values passed by these situations is common, we unify them as having a > scope of "command" rather than "command line".
Is the "unification" something done by this patch? It does not appear to be so. The existing code already was using CMDLINE to call "git -c VAR=VAL" and also something else (which is not clear to me, unfortunately, probably because I failed to parse the above X-<), and this step renames CMDLINE to COMMAND perhaps because CMDLINE has too strong connotation with the "-c" thing and much less with the other thing (which is not clear to me, unfortunately) and you found that renaming it to COMMAND would cover both cases better?
I also do not get what you meant by "visibility", but it probably is primarily because it is not clear what "the other thing" is.
Show 48 quoted lines
> Signed-off-by: Matthew Rogers <mattr94@gmail.com>
> ---
> config.c | 2 +-
> config.h | 2 +-
> t/helper/test-config.c | 4 ++--
> 3 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/config.c b/config.c
> index 447a013a15..f319a3d6a0 100644
> --- a/config.c
> +++ b/config.c
> @@ -1737,7 +1737,7 @@ static int do_git_config_sequence(const struct config_options *opts,
> free(path);
> }
>
> - current_parsing_scope = CONFIG_SCOPE_CMDLINE;
> + current_parsing_scope = CONFIG_SCOPE_COMMAND;
> if (!opts->ignore_cmdline && git_config_from_parameters(fn, data) < 0)
> die(_("unable to parse command-line config"));
>
> diff --git a/config.h b/config.h
> index 284d92fb0e..f383a71404 100644
> --- a/config.h
> +++ b/config.h
> @@ -300,7 +300,7 @@ enum config_scope {
> CONFIG_SCOPE_GLOBAL,
> CONFIG_SCOPE_LOCAL,
> CONFIG_SCOPE_WORKTREE,
> - CONFIG_SCOPE_CMDLINE,
> + CONFIG_SCOPE_COMMAND,
> };
>
> enum config_scope current_config_scope(void);
> diff --git a/t/helper/test-config.c b/t/helper/test-config.c
> index 6695e463eb..78bbb9eb98 100644
> --- a/t/helper/test-config.c
> +++ b/t/helper/test-config.c
> @@ -48,8 +48,8 @@ static const char *scope_name(enum config_scope scope)
> return "repo";
> case CONFIG_SCOPE_WORKTREE:
> return "worktree";
> - case CONFIG_SCOPE_CMDLINE:
> - return "cmdline";
> + case CONFIG_SCOPE_COMMAND:
> + return "command";
> default:
> return "unknown";
> }