summaryrefslogtreecommitdiff
path: root/upload-pack.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-02-12 22:21:04 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-02-12 22:21:04 (GMT)
commit60f81219403d708ab6271f68d8e4e42a39f7459b (patch)
treeed6a00566bbe2eafe22cc0a1069dcae4906b2df8 /upload-pack.c
parent3c12d0b885918fb5c6d5cb2be538639a52e1ef53 (diff)
parentad6b5fefbd15f08a32145e77d0c08394c7f17b9c (diff)
downloadgit-60f81219403d708ab6271f68d8e4e42a39f7459b.zip
git-60f81219403d708ab6271f68d8e4e42a39f7459b.tar.gz
git-60f81219403d708ab6271f68d8e4e42a39f7459b.tar.bz2
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
Diffstat (limited to 'upload-pack.c')
-rw-r--r--upload-pack.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/upload-pack.c b/upload-pack.c
index 4ab55ce..abadc93 100644
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -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++)