Re: [PATCH 01/12] merge-index: drop index compatibility macros

From: Derrick Stolee <stolee@gmail.com>
Date: Jan 4, 2021, 11:08 UTC
Message-ID: <961af585-1b2a-e4e8-d60f-9becbc75b98c@gmail.com>
In-Reply-To: <f3d0ef14-c753-c107-4693-67cec504964a@gmail.com>

On 1/3/2021 6:31 PM, Alban Gruin wrote:

Show 18 quoted lines

> Hi Derrick,
> 
> Le 01/01/2021 à 14:06, Derrick Stolee via GitGitGadget a écrit :
>> From: Derrick Stolee <dstolee@microsoft.com>
>>
>> Replace uses of the old macros for the_index and instead pass around a
>> 'struct index_state' pointer. This allows dropping the compatibility
>> flag.
>>
>> Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
> 
> I already libified builtin/merge-index.c in ag/merge-strategies-in-c,
> and such dropped the_index.  I modified merge_entry(), merge_one_path()
> and merge_all() to take a callback, itself taking a repository.  As
> such, in my series, these functions take a `struct repository *' instead
> of an index state.
> 
> I'm not sure how we should proceed with our respective patches.

Hi Alban,

Sorry I didn't realize that. I'll drop this patch. Thanks for letting me know!

Thanks, -Stolee