From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: Jacob Vosmaer <jacob@gitlab.com>,
Jeff Hostetler <jeffhost@microsoft.com>,
Jonathan Tan <jonathantanmy@google.com>,
git@vger.kernel.org
Subject: Re: [PATCH 1/1] upload-pack.c: fix filter spec quoting bug
Date: Fri, 22 Jan 2021 14:10:25 -0800 [thread overview]
Message-ID: <xmqq4kj87hda.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <YAs2RMT1rEH/2LSp@coredump.intra.peff.net> (Jeff King's message of "Fri, 22 Jan 2021 15:32:04 -0500")
Jeff King <peff@peff.net> writes:
> On Fri, Jan 22, 2021 at 03:21:37PM +0100, Jacob Vosmaer wrote:
>
>> This fixes a bug that occurs when you combine partial clone and
>> uploadpack.packobjectshook. You can reproduce it as follows:
> ...
> I'm somewhat embarrassed to say that despite being the one who added the
> pack-objects hook 4 years ago, we still have not switched over to it at
> GitHub from our custom patch (the reason is just mundane; there's some
> other adjustments that would have to happen and nobody has ever quite
> gotten around to it). Presumably you are looking to use it at GitLab.
> Just beware that you are probably treading new-ish ground, so there may
> be other bugs like this lurking.
>
>> diff --git a/upload-pack.c b/upload-pack.c
>> index 3b66bf92ba..eae1fdbc55 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);
>
> Yep, this looks like the right fix. I think with an addition to the test
> suite, this will be good to go.
Yeah, that looks simpler and better. It does deserve new tests.
Thanks, both.
next prev parent reply other threads:[~2021-01-22 22:13 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-22 14:21 [PATCH 0/1] upload-pack.c: fix filter spec quoting bug Jacob Vosmaer
2021-01-22 14:21 ` [PATCH 1/1] " Jacob Vosmaer
2021-01-22 20:32 ` Jeff King
2021-01-22 21:03 ` [PATCH] run-command: document use_shell option Jeff King
2021-01-22 21:32 ` Taylor Blau
2021-01-22 22:21 ` Junio C Hamano
2021-01-23 0:04 ` Jeff King
2021-01-22 22:10 ` Junio C Hamano [this message]
2021-01-25 17:09 ` [PATCH v2] upload-pack.c: fix filter spec quoting bug Jacob Vosmaer
2021-01-25 19:48 ` Junio C Hamano
2021-01-25 21:16 ` Jeff King
2021-01-25 23:09 ` [PATCH v3 0/1] " Jacob Vosmaer
2021-01-25 23:09 ` [PATCH v3 1/1] " Jacob Vosmaer
2021-01-26 9:57 ` Ævar Arnfjörð Bjarmason
2021-01-26 10:29 ` Jacob Vosmaer
2021-01-26 17:46 ` Junio C Hamano
2021-01-26 21:09 ` Jeff King
2021-01-28 16:04 ` [PATCH v4] " Jacob Vosmaer
[not found] ` <xmqqmtwsx4d9.fsf@gitster.c.googlers.com>
2021-01-28 21:12 ` Jacob Vosmaer
2021-01-28 21:40 ` Jacob Vosmaer
2021-01-28 21:51 ` Jeff King
2021-02-01 20:31 ` Jacob Vosmaer
2021-01-28 21:58 ` Junio C Hamano
2021-02-01 20:29 ` [PATCH v5 0/1] " Jacob Vosmaer
2021-02-01 20:29 ` [PATCH v5 1/1] " Jacob Vosmaer
2021-02-02 5:49 ` [PATCH v5 0/1] " Junio C Hamano
2021-02-02 10:37 ` [PATCH 1/1] t5544: clarify 'hook works with partial clone' test Jacob Vosmaer
2021-02-02 17:22 ` Eric Sunshine
2021-02-02 19:24 ` [PATCH v2] " Jacob Vosmaer
2021-02-02 20:21 ` Junio C Hamano
2021-01-26 17:51 ` [PATCH v3 1/1] upload-pack.c: fix filter spec quoting bug Junio C Hamano
2021-01-26 21:07 ` Jeff King
2021-01-26 0:01 ` [PATCH v3 0/1] " Junio C Hamano
2021-01-26 2:25 ` [PATCH v2] " Junio C Hamano
2021-01-25 21:16 ` Jeff King
2021-01-25 17:14 ` [PATCH 1/1] " Jacob Vosmaer
2021-01-25 17:41 ` Jacob Vosmaer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqq4kj87hda.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=jacob@gitlab.com \
--cc=jeffhost@microsoft.com \
--cc=jonathantanmy@google.com \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).