ag/merge-strategies-in-c [was Re: What's cooking in git.git (Nov 2020, #04; Thu, 19)]

[Alban Gruin <alban.gruin@gmail.com>]

Hi Junio,

Le 21/11/2020 à 23:57, Junio C Hamano a écrit :

> * ag/merge-strategies-in-c (2020-11-16) 12 commits
>  - sequencer: use the "octopus" merge 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-index: don't fork if the requested program is `git-merge-one-file'
>  - merge-index: libify merge_one_path() and merge_all()
>  - merge-one-file: rewrite in C
>  - update-index: move add_cacheinfo() to read-cache.c
>  - t6027: modernise tests
> 
>  The resolve and octopus merge strategy backends have been rewritten
>  in C.
> 

There is some behaviour changes and regressions in this iteration that I
intend to fix.  Expect a reroll soon.

I also noticed that I can show which branch has made a branch when there
is a conflict with the "resolve" strategy, like "recursive" already
does.  Should this change be part of this series, or should it be a
separate patch?

Cheers,
Alban