From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Deveshi Dwivedi <deveshigurgaon@gmail.com>, git@vger.kernel.org
Subject: Re: [PATCH v1 2/2] list-objects-filter-options: avoid strbuf_split_str()
Date: Mon, 9 Mar 2026 15:01:12 -0400 [thread overview]
Message-ID: <20260309190112.GA309867@coredump.intra.peff.net> (raw)
In-Reply-To: <xmqqjyvl57yv.fsf@gitster.g>
On Mon, Mar 09, 2026 at 08:38:16AM -0700, Junio C Hamano wrote:
> > + while (*p && !result) {
> > + const char *sep = strchr(p, '+');
> > + size_t len = sep ? (size_t)(sep - p + 1) : strlen(p);
> > + char *sub = xmemdupz(p, len);
> > +
> > + /* strip '+' separator, but only when more sub-specs follow */
> > + if (sep && *(sep + 1))
> > + sub[len - 1] = '\0';
> > +
> > + result = parse_combine_subfilter(filter_options, sub, errbuf);
> > + free(sub);
> > + if (!sep)
> > + break;
> > + p = sep + 1;
> > }
>
> Hmph, would this loop handle a trailing '+' the same way as before,
> e.g., "combine:tree:2+"? The original would have split the string
> into ["tree:2+", ""] and the last call to parse_combine_subfilter()
> would have been made with an empty string. The new code does not
> make that last call with an empty string. Perhaps the differences
> do not matter? I dunno.
I think the original was wrong in its parsing. The first entry should be
"tree:2", without the trailing "+". And that would almost always result
in rejecting the string, because the "+" doesn't make any sense for most
filters. The exception is:
blob=$(echo foo | git hash-object -w --stdin)
git tag foo+ $blob
git rev-list --filter=combine:sparse:oid=foo+
which happens to work. But it is wrong according to the documentation,
which says that "+" needs to be escaped if you want it passed along to
the sub-filter.
So flagging a trailing "+" as an error would probably be OK, and match
what happens now. But quietly ignoring it is perhaps friendlier (or less
friendly, if you think it might let a typo'd input go unnoticed).
-Peff
next prev parent reply other threads:[~2026-03-09 19:01 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-08 18:03 [PATCH v1 0/2] avoid unnecessary strbuf_split*() and strbuf-by-value usage Deveshi Dwivedi
2026-03-08 18:03 ` [PATCH v1 1/2] worktree: do not pass strbuf by value Deveshi Dwivedi
2026-03-09 14:48 ` Junio C Hamano
2026-03-09 19:26 ` coccinelle to catch pass-by-value?, was: " Jeff King
2026-03-08 18:03 ` [PATCH v1 2/2] list-objects-filter-options: avoid strbuf_split_str() Deveshi Dwivedi
2026-03-09 15:38 ` Junio C Hamano
2026-03-09 19:01 ` Jeff King [this message]
2026-03-09 19:08 ` Jeff King
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260309190112.GA309867@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=deveshigurgaon@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox