diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-05-30 21:51:27 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-30 21:51:27 +0900 |
| commit | b2fd6592943db80ef9bfccbf55d65a39268d76ed (patch) | |
| tree | 35b12601a1261a3654076ae4f70debd0c3c19bf6 /builtin | |
| parent | Merge branch 'sb/submodule-merge-in-merge-recursive' (diff) | |
| parent | config: die when --blob is used outside a repository (diff) | |
| download | tgif-b2fd6592943db80ef9bfccbf55d65a39268d76ed.tar.xz | |
Merge branch 'jk/config-blob-sans-repo'
Error codepath fix.
* jk/config-blob-sans-repo:
config: die when --blob is used outside a repository
Diffstat (limited to 'builtin')
| -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 1e31aa9f8d..b29d26dede 100644 --- a/builtin/config.c +++ b/builtin/config.c @@ -602,6 +602,9 @@ int cmd_config(int argc, const char **argv, const char *prefix) if (use_local_config && nongit) die(_("--local can only be used inside a git repository")); + if (given_config_source.blob && nongit) + die(_("--blob can only be used inside a git repository")); + if (given_config_source.file && !strcmp(given_config_source.file, "-")) { given_config_source.file = NULL; |