From: Junio C Hamano <gitster@pobox.com>
To: Antonin Delpeuch <antonin@delpeuch.eu>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] merge-recursive: honor diff.algorithm
Date: Tue, 09 Jul 2024 11:51:28 -0700 [thread overview]
Message-ID: <xmqqy16ae6vj.fsf@gitster.g> (raw)
In-Reply-To: <198a4c00-291f-456d-84ac-082e142bd4fe@delpeuch.eu> (Antonin Delpeuch's message of "Tue, 9 Jul 2024 19:16:52 +0200")
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.
next prev parent reply other threads:[~2024-07-09 18:51 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-08 9:34 [PATCH] merge-recursive: honor diff.algorithm Antonin Delpeuch via GitGitGadget
2024-07-09 17:16 ` Antonin Delpeuch
2024-07-09 18:51 ` Junio C Hamano [this message]
2024-07-09 19:01 ` [PATCH v2] " Antonin Delpeuch via GitGitGadget
2024-07-10 17:58 ` Junio C Hamano
2024-07-13 16:50 ` Antonin Delpeuch
2024-07-13 16:51 ` [PATCH v3] " Antonin Delpeuch via GitGitGadget
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqy16ae6vj.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=antonin@delpeuch.eu \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.