mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
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
This commit is contained in:
commit
a5e74b4baa
|
@ -251,6 +251,14 @@ test_expect_success 'implicitly construct combine: filter with repeated flags' '
|
|||
test_cmp unique_types.expected unique_types.actual
|
||||
'
|
||||
|
||||
test_expect_success 'upload-pack complains of bogus filter config' '
|
||||
printf 0000 |
|
||||
test_must_fail git \
|
||||
-c uploadpackfilter.tree.maxdepth \
|
||||
upload-pack . >/dev/null 2>err &&
|
||||
test_i18ngrep "unable to parse.*tree.maxdepth" err
|
||||
'
|
||||
|
||||
test_expect_success 'upload-pack fails banned object filters' '
|
||||
test_config -C srv.bare uploadpackfilter.blob:none.allow false &&
|
||||
test_must_fail ok=sigpipe git clone --no-checkout --filter=blob:none \
|
||||
|
|
|
@ -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");
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue