Christian Couder <christian.couder@xxxxxxxxx> writes: > On Mon, Jul 15, 2019 at 1:16 AM Matthew DeVore <matvore@xxxxxxxxxxx> wrote: >> >> On Fri, Jul 12, 2019 at 02:02:52PM -0700, Junio C Hamano wrote: >> > * md/list-objects-filter-combo (2019-06-28) 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: encapsulate filter components >> > >> > The list-objects-filter API (used to create a sparse/lazy clone) >> > learned to take a combined filter specification. >> > >> > There is a bit of interaction with cc/multi-promisor topic, whose >> > conflict resolution I have no confidence in X-<. Extra sets of >> > eyes are appreciated. >> >> Sorry for the delay. I was on vacation and then catching up for a week after I >> got back. I uploaded a merged commit here: >> >> https://github.com/matvore/git/tree/filts >> >> And the merged file itself (only this one had conflicts) is here: >> >> https://github.com/matvore/git/blob/filts/list-objects-filter.c > > The merge and the explanations behind it all look good to me. > > Thanks for your work on this! > Christian. Thanks, both.
