summaryrefslogtreecommitdiff
path: root/config.c
diff options
context:
space:
mode:
authorMatthew Rogers <mattr94@gmail.com>2020-02-10 00:30:55 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-02-10 18:39:02 (GMT)
commit6766e41b8aae21927625adbb8cdc87804153639a (patch)
tree17c5bb7edb99eff7fbc1e7228f0fb8be2290e160 /config.c
parent6dc905d97431d683b418978819629a2626555b2e (diff)
downloadgit-6766e41b8aae21927625adbb8cdc87804153639a.zip
git-6766e41b8aae21927625adbb8cdc87804153639a.tar.gz
git-6766e41b8aae21927625adbb8cdc87804153639a.tar.bz2
config: clarify meaning of command line scoping
CONFIG_SCOPE_CMDLINE is generally used in the code to refer to config values passed in via the -c option. Options passed in using this mechanism share similar scoping characteristics with the --file and --blob options of the 'config' command, namely that they are only in use for that single invocation of git, and that they supersede the normal system/global/local hierarchy. This patch introduces CONFIG_SCOPE_COMMAND to reflect this new idea, which also makes CONFIG_SCOPE_CMDLINE redundant. Signed-off-by: Matthew Rogers <mattr94@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'config.c')
-rw-r--r--config.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/config.c b/config.c
index f68eec7..fe1e44a 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"));
@@ -3305,8 +3305,8 @@ const char *config_scope_name(enum config_scope scope)
return "local";
case CONFIG_SCOPE_WORKTREE:
return "worktree";
- case CONFIG_SCOPE_CMDLINE:
- return "cmdline";
+ case CONFIG_SCOPE_COMMAND:
+ return "command";
default:
return "unknown";
}