summaryrefslogtreecommitdiff
path: root/config.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2011-06-09 15:52:32 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-06-22 18:24:50 (GMT)
commit1c2c9bee1bad9a4133a934d04c32b033cc16c8aa (patch)
tree3b92c27ac88d43018dbba51fcd037f2a03e19ed9 /config.c
parent5bf6529aaa3fa829328ae00ddf7aa851935443b5 (diff)
downloadgit-1c2c9bee1bad9a4133a934d04c32b033cc16c8aa.zip
git-1c2c9bee1bad9a4133a934d04c32b033cc16c8aa.tar.gz
git-1c2c9bee1bad9a4133a934d04c32b033cc16c8aa.tar.bz2
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 <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'config.c')
-rw-r--r--config.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/config.c b/config.c
index 84ff346..2567b54 100644
--- a/config.c
+++ b/config.c
@@ -858,7 +858,7 @@ int git_config_early(config_fn_t fn, void *data, const char *repo_config)
switch (git_config_from_parameters(fn, data)) {
case -1: /* error */
- ret--;
+ die("unable to parse command-line config");
break;
case 0: /* found nothing */
break;