Re: What's cooking in git.git (Jun 2019, #06; Wed, 26)
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Jun 28, 2019, 02:26 UTC
- Message-ID
- <xmqqef3ea1j6.fsf@gitster-ct.c.googlers.com>
- In-Reply-To
- <20190627194809.GA54617@comcast.net>
Matthew DeVore <matvore@comcast.net> writes:
Show 22 quoted lines
> On Wed, Jun 26, 2019 at 03:29:29PM -0700, Junio C Hamano wrote: >> * md/list-objects-filter-combo (2019-06-17) 10 commits >> - list-objects-filter-options: make parser void >> - list-objects-filter-options: clean up use of ALLOC_GROW >> - list-objects-filter-options: allow mult. --filter >> - strbuf: give URL-encoding API a char predicate fn >> - list-objects-filter-options: make filter_spec a string_list >> - list-objects-filter-options: move error check up >> - list-objects-filter: implement composite filters >> - list-objects-filter-options: always supply *errbuf >> - list-objects-filter: put omits set in filter struct >> - list-objects-filter: make API easier to use >> >> The list-objects-filter API (used to create a sparse/lazy clone) >> learned to take a combined filter specification. >> >> Will merge to 'next'. >> > > Great, thank you. I do want to apply jonathantanmy@google.com's > readability/textual suggestions. Can you wait until the next roll-up before > merging, please? I'll send it out today.
TAhanks for stopping me.
Also please be sure to address https://travis-ci.org/git/git/jobs/551523578 (scroll to the end of the log).
commit ebcfc8579f827d952b39bb930123671ab5c5b208 Author: Junio C Hamano <gitster@pobox.com> Date: Thu Jun 27 19:24:04 2019 -0700
fixup! list-objects-filter: implement composite filters
diff --git a/list-objects-filter-options.c b/list-objects-filter-options.c index e19ecdcafa..f17d33f29b 100644 --- a/list-objects-filter-options.c +++ b/list-objects-filter-options.c @@ -146,8 +146,8 @@ static int parse_combine_filter( int result = 0; if (!subspecs[0]) { - strbuf_addf(errbuf, - _("expected something after combine:")); + strbuf_addstr(errbuf, + _("expected something after combine:")); result = 1; goto cleanup; }