From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 01 Sep 2020 21:11:10 GMT
Subject: Re: [PATCH v2 03/11] merge-index: libify merge_one_path() and merge_all()
Message-ID: <xmqqft81cidt.fsf@gitster.c.googlers.com>
In-Reply-To: <20200901105705.6059-4-alban.gruin@gmail.com>

Alban Gruin <alban.gruin@gmail.com> writes:

> The "resolve" and "octopus" merge strategies do not call directly `git
> merge-one-file', they delegate the work to another git command, `git
> merge-index', that will loop over files in the index and call the
> specified command.  Unfortunately, these functions are not part of
> libgit.a, which means that once rewritten, the strategies would still
> have to invoke `merge-one-file' by spawning a new process first.
>
> To avoid this, this moves merge_one_path(), merge_all(), and their
> helpers to merge-strategies.c.  They also take a callback to dictate
> what they should do for each file.  For now, only one launching a new
> process is defined to preserve the behaviour of the builtin version.

... of the "builtin" version?  I thought this series is introducing
a new builtin version?  Puzzled...