diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-05-30 15:51:27 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-30 15:51:27 +0300 |
| commit | b2fd6592943db80ef9bfccbf55d65a39268d76ed (patch) | |
| tree | 35b12601a1261a3654076ae4f70debd0c3c19bf6 | |
| parent | 0821b73063a6d4cfd2f61619b7afe01ce9c6d99e (diff) | |
| parent | 17b8a2d6cdfc359b1a7de6dd215dc3c32ab1dbfe (diff) | |
Merge branch 'jk/config-blob-sans-repo'
Error codepath fix.
* jk/config-blob-sans-repo:
config: die when --blob is used outside a repository
| -rw-r--r-- | builtin/config.c | 3 | ||||
| -rwxr-xr-x | t/t1307-config-blob.sh | 4 |
2 files changed, 7 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; diff --git a/t/t1307-config-blob.sh b/t/t1307-config-blob.sh index eed31ffa30..37dc689d8c 100755 --- a/t/t1307-config-blob.sh +++ b/t/t1307-config-blob.sh @@ -73,4 +73,8 @@ test_expect_success 'can parse blob ending with CR' ' test_cmp expect actual ' +test_expect_success 'config --blob outside of a repository is an error' ' + test_must_fail nongit git config --blob=foo --list +' + test_done |