summary refs log tree commit diff
path: root/upload-pack.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2020-12-03 03:09:42 -0500
committerJunio C Hamano <gitster@pobox.com>2020-12-03 10:25:13 -0800
commitd43a21bdbbaf0bc286df8d8e2e29a3e9caa448e8 (patch)
treec042749d6a3ee007d0ac8655f65912ead9f1a395 /upload-pack.c
parent898f80736c75878acc02dc55672317fcc0e0a5a6 (diff)
upload-pack: propagate return value from object filter config callback
If we encounter an error in parse_filter_object_config(), we'll complain
to stderr but won't actually propagate the return value up the stack.
This is unlike most of our config callbacks, which return the error to
git_config() so it can die (this includes the call just below us to
parse_hide_refs_config(), which can also produce errors).

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'upload-pack.c')
-rw-r--r--upload-pack.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/upload-pack.c b/upload-pack.c
index 3b858eb457..1dd8afbbcb 100644
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -1307,7 +1307,8 @@ static int upload_pack_config(const char *var, const char *value, void *cb_data)
 			return git_config_string(&data->pack_objects_hook, var, value);
 	}
 
-	parse_object_filter_config(var, value, data);
+	if (parse_object_filter_config(var, value, data) < 0)
+		return -1;
 
 	return parse_hide_refs_config(var, value, "uploadpack");
 }