Re: [PATCH v3 04/11] merge-index: don't fork if the requested program is `git-merge-one-file'

From: Junio C Hamano <gitster@pobox.com>
Date: Oct 16, 2020, 19:07 UTC
Message-ID: <xmqqv9faat2i.fsf@gitster.c.googlers.com>
In-Reply-To: <20201005122646.27994-5-alban.gruin@gmail.com>

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

Show 6 quoted lines

> Since `git-merge-one-file' has been rewritten and libified, this teaches
> `merge-index' to call merge_strategies_one_file() without forking using
> a new callback, merge_one_file_cb().
>
> Signed-off-by: Alban Gruin <alban.gruin@gmail.com>
> ---

I do not know how much of the change in this patch survives when the previous step gets adjusted, so I'll skip this step for now.

Thanks.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.