ag/merge-strategies-in-c (was: What's cooking in git.git (Dec 2022, #05; Wed, 14))

["Ævar Arnfjörð Bjarmason" <avarab@gmail.com>]

On Wed, Dec 14 2022, Junio C Hamano wrote:

> * ag/merge-strategies-in-c (2022-08-10) 14 commits
>  . sequencer: use the "octopus" strategy without forking
>  . sequencer: use the "resolve" strategy without forking
>  . merge: use the "octopus" strategy without forking
>  . merge: use the "resolve" strategy without forking
>  . merge-octopus: rewrite in C
>  . merge-recursive: move better_branch_name() to merge.c
>  . merge-resolve: rewrite in C
>  . merge-one-file: rewrite in C
>  . update-index: move add_cacheinfo() to read-cache.c
>  . merge-index: add a new way to invoke `git-merge-one-file'
>  . merge-index: drop the index
>  . merge-index: libify merge_one_path() and merge_all()
>  . t6060: add tests for removed files
>  . t6060: modify multiple files to expose a possible issue with merge-index
>
>  An attempt to rewrite remaining merge strategies from shell to C.
>
>  Tired of waiting for too long.
>  source: <20220809185429.20098-1-alban.gruin@gmail.com>

I submitted a v9 of this during Taylor's maintainership, but it fell
between the cracks. I've submitted a rebased-on-master v10 now (there
were some conflicts):
https://lore.kernel.org/git/cover-v10-00.12-00000000000-20221215T084803Z-avarab@gmail.com/

It's just the "prep" patches, the real meaty part is converting the
merge drivers, which will come after. Some of the performance numbers
for those are really impressive...