mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jk/config-blob-sans-repo'

Browse Source 
Error codepath fix.

* jk/config-blob-sans-repo:
  config: die when --blob is used outside a repository
This commit is contained in:
Junio C Hamano
2018-05-30 21:51:27 +09:00
parent 0821b73063 17b8a2d6cd
commit b2fd659294
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
builtin/config.c
View File

@ -602,6 +602,9 @@ int cmd_config(int argc, const char **argv, const char *prefix)
if (use_local_config && nongit) if (use_local_config && nongit)
die(_("--local can only be used inside a git repository")); 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 && if (given_config_source.file &&
!strcmp(given_config_source.file, "-")) { !strcmp(given_config_source.file, "-")) {
given_config_source.file = NULL; given_config_source.file = NULL;

4
t/t1307-config-blob.sh
View File

@ -73,4 +73,8 @@ test_expect_success 'can parse blob ending with CR' '
test_cmp expect actual 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 test_done