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

From: Alban Gruin <alban.gruin@gmail.com>
Date: Jan 3, 2021, 23:31 UTC
Message-ID: <f3d0ef14-c753-c107-4693-67cec504964a@gmail.com>
In-Reply-To: <68d88b651c74659eb171e88d701b89d11e7f5f24.1609506428.git.gitgitgadget@gmail.com>

Hi Derrick,

Le 01/01/2021 à 14:06, Derrick Stolee via GitGitGadget a écrit :

Show 7 quoted lines

> 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.

Cheers, Alban