diff options
| author | Jeff King <peff@peff.net> | 2017-05-12 16:34:36 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-05-15 15:29:47 +0900 |
| commit | 633f967732c48b7dcd9128d988a33510b7c9efe9 (patch) | |
| tree | 036e0cd81015e447cc2594d226d1507675d50b9a | |
| parent | bccb22cbb15d45c940da4c54231949c722d4fe30 (diff) | |
| download | git-jk/no-looking-at-dotgit-outside-repo.tar.gz | |
config: complain about --local outside of a git repojk/no-looking-at-dotgit-outside-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 <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/config.c | 3 |
1 files changed, 3 insertions, 0 deletions
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; |