Skip to content

Commit 1c2c9be

Browse files
peffgitster
authored andcommitted
config: die on error in command-line config
The error handling for git_config is somewhat confusing. We collect errors from running git_config_from_file on the various config files and carefully pass them back up. But the two odd things are: 1. We actually die on most errors in git_config_from_file. In fact, the only error we actually pass back up is if fopen() fails on the file. 2. Most callers of git_config do not check the error return at all, but will continue if git_config reports an error. When the code for "git -c core.foo=bar" was added, it dutifully passed errors up the call stack, only for them to be eventually ignored. This makes it inconsistent with the file-parsing code, which will die when it sees malformed config. And it's somewhat unsafe, because it means an error in parsing a typo like: git -c clean.requireforce=ture clean will continue the command, ignoring the config the user tried to give. Signed-off-by: Jeff King <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 5bf6529 commit 1c2c9be

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

config.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -858,7 +858,7 @@ int git_config_early(config_fn_t fn, void *data, const char *repo_config)
858858

859859
switch (git_config_from_parameters(fn, data)) {
860860
case -1: /* error */
861-
ret--;
861+
die("unable to parse command-line config");
862862
break;
863863
case 0: /* found nothing */
864864
break;

t/t1300-repo-config.sh

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -910,4 +910,12 @@ test_expect_success 'git -c does not split values on equals' '
910910
test_cmp expect actual
911911
'
912912

913+
test_expect_success 'git -c dies on bogus config' '
914+
test_must_fail git -c core.bare=foo rev-parse
915+
'
916+
917+
test_expect_success 'git -c complains about empty key' '
918+
test_must_fail git -c "=foo" rev-parse
919+
'
920+
913921
test_done

0 commit comments

Comments
 (0)