git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 1/1] upload-pack.c: fix filter spec quoting bug

From
Junio C Hamano <gitster@pobox.com>
Date
Jan 22, 2021, 22:10 UTC
Message-ID
<xmqq4kj87hda.fsf@gitster.c.googlers.com>
In-Reply-To
<YAs2RMT1rEH/2LSp@coredump.intra.peff.net>
Jeff King <peff@peff.net> writes:
Show 33 quoted lines
> 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.
Previous: Jeff KingNext: Jacob Vosmaer
Message 8 of 13 in “upload-pack.c: fix filter spec quoting bug”
  1. 0/1 upload-pack.c: fix filter spec quoting bugJacob Vosmaer, Jan 22, 2021
  2. 1/1 upload-pack.c: fix filter spec quoting bugJacob Vosmaer, Jan 22, 2021
  3. Jeff KingJan 22, 2021
  4. run-command: document use_shell optionJeff King, Jan 22, 2021
  5. Taylor BlauJan 22, 2021
  6. Junio C HamanoJan 22, 2021
  7. Jeff KingJan 23, 2021
  8. Junio C HamanoJan 22, 2021
  9. upload-pack.c: fix filter spec quoting bugJacob Vosmaer, Jan 25, 2021
  10. Junio C HamanoJan 25, 2021
  11. Jeff KingJan 25, 2021
  12. Jacob VosmaerJan 25, 2021
  13. Jacob VosmaerJan 25, 2021

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.