From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 09 Jul 2024 18:51:28 GMT
Subject: Re: [PATCH] merge-recursive: honor diff.algorithm
Message-ID: <xmqqy16ae6vj.fsf@gitster.g>
In-Reply-To: <198a4c00-291f-456d-84ac-082e142bd4fe@delpeuch.eu>

Antonin Delpeuch <antonin@delpeuch.eu> writes:

> I have second thoughts about this, perhaps it is possible to refactor
> things a bit further, imitating diff.c which has "git_diff_ui_config"
> and "git_diff_basic_config". In a similar way, we could have
> "init_merge_ui_options" and "init_merge_basic_options" which the
> commands could call depending on whether they are porcelain or plumbing.

It does make sense to treat the internal merge_recursive() function
as robust and reliable building block whose behaviour does not get
affected by configuration beyond the control of the caller, just
like we treat a plumbing command.

Thanks.