config: report correct line number upon error
When get_value() parses a key/value pair, it is possible that the line number is decreased (because the \n has been consumed already) before the key/value pair is passed to the callback function, to allow for the correct line to be attributed in case of an error. However, when git_parse_source() asks get_value() to parse the key/value pair, the error reporting is performed *after* get_value() returns. Which means that we have to be careful not to increase the line number in get_value() after the callback function returned an error. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Reviewed-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Schindelin committed
Jun 14, 2017 at 13:35 UTC
e2e142510762712b4b005dca6c7a9676f93a3278
2 files changed
+8
-1
config.c
+2
-1
@@ -588,7 +588,8 @@ static int get_value(config_fn_t fn, void *data, struct strbuf *name)
588
*/
589
cf->linenr--;
590
ret = fn(name->buf, value, data);
591
- cf->linenr++;
591
+ if (ret >= 0)
592
+ cf->linenr++;
593
return ret;
594
}
595
t/t1300-repo-config.sh
+6
@@ -703,6 +703,12 @@ test_expect_success 'invalid unit' '
703
test_i18ngrep "bad numeric config value .1auto. for .aninvalid.unit. in file .git/config: invalid unit" actual
704
'
705
706
+test_expect_success 'line number is reported correctly' '
707
+ printf "[bool]\n\tvar\n" >invalid &&
708
+ test_must_fail git config -f invalid --path bool.var 2>actual &&
709
+ test_i18ngrep "line 2" actual
710
+'
711
+
712
test_expect_success 'invalid stdin config' '
713
echo "[broken" | test_must_fail git config --list --file - >output 2>&1 &&
714
test_i18ngrep "bad config line 1 in standard input" output