Skip to content

Commit ad5df6b

Browse files
jacobvosmaergitster
authored andcommitted
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 10ac85c (upload-pack: add object filtering for partial clone, 2017-12-08) when the server side filter support was introduced. In fact, in 10ac85c this was broken regardless of uploadpack.packObjectsHook. Then in 0b6069f (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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 71ca53e commit ad5df6b

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

t/t5544-pack-objects-hook.sh

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,4 +59,13 @@ 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=print HEAD >objects &&
68+
grep "^?" objects
69+
'
70+
6271
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)