[PATCH 3/3] config: complain about --local outside of a git repo
- From
Jeff King <peff@peff.net>
- Date
- May 13, 2017, 03:29 UTC
- Message-ID
- <20170513032931.uyvhfw6fgju36ovf@sigill.intra.peff.net>
- In-Reply-To
- <20170513032414.mfrwabt4hovujde2@sigill.intra.peff.net>
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 with an assertion.
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 (e.g., when writing). These cases are already protected by similar checks, and covered by a test in t1308.
Signed-off-by: Jeff King <peff@peff.net> --- builtin/config.c | 3 +++ t/t1300-repo-config.sh | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/builtin/config.c b/builtin/config.c index 3a554ad50..7f6c25d4d 100644 --- a/builtin/config.c +++ b/builtin/config.c @@ -496,6 +496,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; diff --git a/t/t1300-repo-config.sh b/t/t1300-repo-config.sh index 867704a64..13b7851f7 100755 --- a/t/t1300-repo-config.sh +++ b/t/t1300-repo-config.sh @@ -1539,7 +1539,7 @@ test_expect_success !MINGW '--show-origin blob ref' ' test_cmp expect output ' -test_expect_failure '--local requires a repo' ' +test_expect_success '--local requires a repo' ' # we expect 128 to ensure that we do not simply # fail to find anything and return code "1" test_expect_code 128 nongit git config --local foo.bar
-- 2.13.0.452.g0afc8e12b