diff options
| author | Jeff King <peff@peff.net> | 2017-05-13 03:29:31 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-05-15 02:30:51 (GMT) |
| commit | 25cd291963e4b0fae0eabe7fe02be693702d79bb (patch) | |
| tree | e8a47ce8fd085a661ebad759af297ccb33d5f9f9 /builtin/config.c | |
| parent | 588a538ae554f61a37d43c972da75d0f7c3ed484 (diff) | |
| download | git-25cd291963e4b0fae0eabe7fe02be693702d79bb.zip git-25cd291963e4b0fae0eabe7fe02be693702d79bb.tar.gz git-25cd291963e4b0fae0eabe7fe02be693702d79bb.tar.bz2 | |
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 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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/config.c')
| -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 3a554ad..7f6c25d 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; |