diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-12-14 18:21:37 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-12-14 18:21:37 (GMT) |
| commit | a5e74b4baaf17ea069fa451c405ef219eb61ee7a (patch) | |
| tree | b4fddbe693872c11d1515463e0c37e77d4522843 /upload-pack.c | |
| parent | aa35dadb26bf79fc100d84f3effbdc161849386c (diff) | |
| parent | d43a21bdbbaf0bc286df8d8e2e29a3e9caa448e8 (diff) | |
| download | git-a5e74b4baaf17ea069fa451c405ef219eb61ee7a.zip git-a5e74b4baaf17ea069fa451c405ef219eb61ee7a.tar.gz git-a5e74b4baaf17ea069fa451c405ef219eb61ee7a.tar.bz2 | |
Merge branch 'jk/check-config-parsing-error-in-upload-pack'
Tighten error checking in the codepath that responds to "git fetch".
* jk/check-config-parsing-error-in-upload-pack:
upload-pack: propagate return value from object filter config callback
Diffstat (limited to 'upload-pack.c')
| -rw-r--r-- | upload-pack.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/upload-pack.c b/upload-pack.c index 8abb7de..a856de1 100644 --- a/upload-pack.c +++ b/upload-pack.c @@ -1329,7 +1329,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"); } |