From: Johannes Schindelin Date: Fri, 21 Jun 2019 18:17:50 GMT Subject: Re: [PATCH v4 04/10] list-objects-filter: implement composite filters Message-ID: In-Reply-To: <20190618202216.GA35347@comcast.net> Hi, On Tue, 18 Jun 2019, Matthew DeVore wrote: > On Tue, Jun 18, 2019 at 10:42:10AM +0200, Johannes Schindelin wrote: > > > + if (!subspecs[0]) { > > > + strbuf_addf(errbuf, > > > + _("expected something after combine:")); > > > > Please squash this in, to pacify Coccinelle: Junio, maybe you can apply a SQUASH??? on top? This is the reason why `pu` is failing in the Azure Pipeline. Thanks, Dscho > > > > -- snipsnap -- > > diff --git a/list-objects-filter-options.c b/list-objects-filter-options.c > > index 5e5e30bc6a17..483ab512e24c 100644 > > --- a/list-objects-filter-options.c > > +++ b/list-objects-filter-options.c > > @@ -150,7 +150,7 @@ static int parse_combine_filter( > > int result = 0; > > > > if (!subspecs[0]) { > > - strbuf_addf(errbuf, > > + strbuf_addstr(errbuf, > > Thank you - fixed locally for the next re-roll. >