Skip to content

Commit 60f8121

Browse files
committed
Merge branch 'jv/upload-pack-filter-spec-quotefix'
Fix in passing custom args from "git clone" to "upload-pack" on the other side. * jv/upload-pack-filter-spec-quotefix: t5544: clarify 'hook works with partial clone' test upload-pack.c: fix filter spec quoting bug
2 parents 3c12d0b + ad6b5fe commit 60f8121

File tree

2 files changed

+11
-8
lines changed

2 files changed

+11
-8
lines changed

t/t5544-pack-objects-hook.sh

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,4 +59,14 @@ test_expect_success 'hook does not run from repo config' '
5959
test_path_is_missing .git/hook.stdout
6060
'
6161

62+
test_expect_success 'hook works with partial clone' '
63+
clear_hook_results &&
64+
test_config_global uploadpack.packObjectsHook ./hook &&
65+
test_config_global uploadpack.allowFilter true &&
66+
git clone --bare --no-local --filter=blob:none . dst.git &&
67+
git -C dst.git rev-list --objects --missing=allow-any --no-object-names --all >objects &&
68+
git -C dst.git cat-file --batch-check="%(objecttype)" <objects >types &&
69+
! grep blob types
70+
'
71+
6272
test_done

upload-pack.c

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -305,14 +305,7 @@ static void create_pack_file(struct upload_pack_data *pack_data,
305305
if (pack_data->filter_options.choice) {
306306
const char *spec =
307307
expand_list_objects_filter_spec(&pack_data->filter_options);
308-
if (pack_objects.use_shell) {
309-
struct strbuf buf = STRBUF_INIT;
310-
sq_quote_buf(&buf, spec);
311-
strvec_pushf(&pack_objects.args, "--filter=%s", buf.buf);
312-
strbuf_release(&buf);
313-
} else {
314-
strvec_pushf(&pack_objects.args, "--filter=%s", spec);
315-
}
308+
strvec_pushf(&pack_objects.args, "--filter=%s", spec);
316309
}
317310
if (uri_protocols) {
318311
for (i = 0; i < uri_protocols->nr; i++)

0 commit comments

Comments
 (0)