mirror of
https://github.com/git/git.git
synced 2024-04-26 13:35:11 +02:00
Merge branch 'jv/upload-pack-filter-spec-quotefix' into next
Fix in passing custom args from "git clone" to "upload-pack" on the other side. * jv/upload-pack-filter-spec-quotefix: upload-pack.c: fix filter spec quoting bug
This commit is contained in:
commit
789bf4154e
|
@ -59,4 +59,13 @@ test_expect_success 'hook does not run from repo config' '
|
|||
test_path_is_missing .git/hook.stdout
|
||||
'
|
||||
|
||||
test_expect_success 'hook works with partial clone' '
|
||||
clear_hook_results &&
|
||||
test_config_global uploadpack.packObjectsHook ./hook &&
|
||||
test_config_global uploadpack.allowFilter true &&
|
||||
git clone --bare --no-local --filter=blob:none . dst.git &&
|
||||
git -C dst.git rev-list --objects --missing=print HEAD >objects &&
|
||||
grep "^?" objects
|
||||
'
|
||||
|
||||
test_done
|
||||
|
|
|
@ -305,14 +305,7 @@ static void create_pack_file(struct upload_pack_data *pack_data,
|
|||
if (pack_data->filter_options.choice) {
|
||||
const char *spec =
|
||||
expand_list_objects_filter_spec(&pack_data->filter_options);
|
||||
if (pack_objects.use_shell) {
|
||||
struct strbuf buf = STRBUF_INIT;
|
||||
sq_quote_buf(&buf, spec);
|
||||
strvec_pushf(&pack_objects.args, "--filter=%s", buf.buf);
|
||||
strbuf_release(&buf);
|
||||
} else {
|
||||
strvec_pushf(&pack_objects.args, "--filter=%s", spec);
|
||||
}
|
||||
strvec_pushf(&pack_objects.args, "--filter=%s", spec);
|
||||
}
|
||||
if (uri_protocols) {
|
||||
for (i = 0; i < uri_protocols->nr; i++)
|
||||
|
|
Loading…
Reference in New Issue