Subject: Re: What's cooking in git.git (Mar 2021, #06; Sat, 20)

From: Junio C Hamano <[email-masked]>
Date: Mon, 22 Mar 2021 11:41:49 -0700

Matheus Tavares Bernardino <[email-masked]> writes:

> Hi, Junio
>
> On Sat, Mar 20, 2021 at 6:40 PM Junio C Hamano <[email-masked]> wrote:
>>
>> * mt/parallel-checkout-part-1 (2021-03-18) 9 commits
>>   (merged to 'next' on 2021-03-19 at a1bc83ad8e)
>>  + entry: add checkout_entry_ca() taking preloaded conv_attrs
>>  + entry: move conv_attrs lookup up to checkout_entry()
>>  + entry: extract update_ce_after_write() from write_entry()
>>  + entry: make fstat_output() and read_blob_entry() public
>>  + entry: extract a header file for entry.c functions
>>  + convert: add classification for conv_attrs struct
>>  + convert: add get_stream_filter_ca() variant
>>  + convert: add [async_]convert_to_working_tree_ca() variants
>>  + convert: make convert_attrs() and convert structs public
>>  (this branch is used by mt/parallel-checkout-part-2.)
>>
>>  Preparatory API changes for parallel checkout.
>>
>>  Will merge to 'master'.
>
> Sorry for my confusion, but are you going to squash the `#include
> "entry.h"` fix [1] or do you want me to re-roll this series with it?

I was planning to merge that down to 'master' as-is, with exactly
the same merge-fix to deal with the entry.h fallout that we have
been successfully using while merging the topic to 'seen' and
'next', without any need to have an explicit "oops, entry.h needs to
be included these days", but I think you are right---it would be
cleaner to keep the rebased series build by itself.

As we'll be rewinding and rebuilding 'next' soonish, let's kick the
topic out of 'next' when it happens, so that we can replace it (and
the part-2 topic that depends on it) with a reroll.

Thanks.