@matheusbsbs / matheus-bagliano / commits / ad5df6b782

upload-pack.c: fix filter spec quoting bug

Fix a bug in upload-pack.c that occurs when you combine partial clone and uploadpack.packObjectsHook. You can reproduce it as follows: git clone -u 'git -c uploadpack.allowfilter '\ '-c uploadpack.packobjectshook=env '\ 'upload-pack' --filter=blob:none --no-local \ src.git dst.git Be careful with the line endings because this has a long quoted string as the -u argument. The error I get when I run this is: Cloning into '/tmp/broken'... remote: fatal: invalid filter-spec ''blob:none'' error: git upload-pack: git-pack-objects died with error. fatal: git upload-pack: aborting due to possible repository corruption on the remote side. remote: aborting due to possible repository corruption on the remote side. fatal: early EOF fatal: index-pack failed The problem is caused by unneeded quoting. This bug was already present in 10ac85c785 (upload-pack: add object filtering for partial clone, 2017-12-08) when the server side filter support was introduced. In fact, in 10ac85c785 this was broken regardless of uploadpack.packObjectsHook. Then in 0b6069fe0a (fetch-pack: test support excluding large blobs, 2017-12-08) the quoting was removed but only behind a conditional that depends on whether uploadpack.packObjectsHook is set. Because uploadpack.packObjectsHook is apparently rarely used, nobody noticed the problematic quoting could still happen. Remove the conditional quoting and add a test for partial clone in t5544-pack-objects-hook. Signed-off-by: Jacob Vosmaer <jacob@gitlab.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jacob Vosmaer committed Jan 28, 2021 at 17:04 UTC ad5df6b782a13854c9ae9d273dd03c5b935ed7cb
2 files changed +10 -8
t/t5544-pack-objects-hook.sh
+9
@@ -59,4 +59,13 @@ test_expect_success 'hook does not run from repo config' '
59 test_path_is_missing .git/hook.stdout
60 '
61
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=print HEAD >objects &&
68 + grep "^?" objects
69 +'
70 +
71 test_done
upload-pack.c
+1 -8
@@ -305,14 +305,7 @@ static void create_pack_file(struct upload_pack_data *pack_data,
305 if (pack_data->filter_options.choice) {
306 const char *spec =
307 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);
309 }
310 if (uri_protocols) {
311 for (i = 0; i < uri_protocols->nr; i++)