Re: [PATCH v6 04/13] merge-one-file: rewrite in C

From: Junio C Hamano <gitster@pobox.com>
Date: Jan 8, 2021, 06:54 UTC
Message-ID: <xmqqwnwnj4vh.fsf@gitster.c.googlers.com>
In-Reply-To: <30de2a29-a3fe-57f7-76b4-5d2bd3688635@gmail.com>

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

>> If we were to do that, then I do not mind the repetition of 0, 1, 1
>> too much.

Sorry, I think we will not need to see repetition of "0, 1, 1" if we take the route I outlined above.

> Okay.  Are we sure we want add_merge_result_to_index() inside
> read-cache.c/cache.h?

I wouldn't be surprised if you can find a better place, so please try to see if there is one. If the only user ends up being the merge-one-file itself and nobody else, then it may be a better place. Or perhaps merge-strategies.c turns out to be a better place if other parts of the merge machinery can reuse it.

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.