From 633f967732c48b7dcd9128d988a33510b7c9efe9 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Fri, 12 May 2017 16:34:36 -0400 Subject: config: complain about --local outside of a git repo The "--local" option instructs git-config to read or modify the repository-level config. This doesn't make any sense if you're not actually in a repository. Older versions of Git would blindly try to read or write ".git/config". For reading, this would result in a quiet failure, since there was no config to read (and thus no matching config value). Writing would generally fail noisily, since ".git" was unlikely to exist. But since b1ef400ee (setup_git_env: avoid blind fall-back to ".git", 2016-10-20), we catch this in the call to git_pathdup() and die("BUG"). Dying is the right thing to do, but we should catch the problem early and give a more human-friendly error message. Note that even without --local, git-config will sometimes default to using local repository config. These cases are already protected by a similar check. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- builtin/config.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/builtin/config.c b/builtin/config.c index 05843a0f96..22a602afac 100644 --- a/builtin/config.c +++ b/builtin/config.c @@ -495,6 +495,9 @@ int cmd_config(int argc, const char **argv, const char *prefix) usage_with_options(builtin_config_usage, builtin_config_options); } + if (use_local_config && nongit) + die(_("--local can only be used inside a git repository")); + if (given_config_source.file && !strcmp(given_config_source.file, "-")) { given_config_source.file = NULL; -- cgit v1.2.1