path: root/config.c
diff options
authorJohannes Schindelin <>2017-06-14 11:35:46 (GMT)
committerJunio C Hamano <>2017-06-15 19:31:43 (GMT)
commite2e142510762712b4b005dca6c7a9676f93a3278 (patch)
tree569f07b8d0e7de3fcd9c9a79ee88d98e9eb18592 /config.c
parent69743f9b4f8411853e347fbd392221552b43fd12 (diff)
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 <> Reviewed-by: Jeff King <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'config.c')
1 files changed, 2 insertions, 1 deletions
diff --git a/config.c b/config.c
index b4a3205..3df7515 100644
--- a/config.c
+++ b/config.c
@@ -588,7 +588,8 @@ static int get_value(config_fn_t fn, void *data, struct strbuf *name)
ret = fn(name->buf, value, data);
- cf->linenr++;
+ if (ret >= 0)
+ cf->linenr++;
return ret;