]> git.ipfire.org Git - thirdparty/git.git/commit
merge-tree: only use basic merge config
authorPhillip Wood <phillip.wood@dunelm.org.uk>
Tue, 18 Feb 2025 16:24:37 +0000 (16:24 +0000)
committerJunio C Hamano <gitster@pobox.com>
Tue, 18 Feb 2025 17:52:39 +0000 (09:52 -0800)
commit54cf5d2da897d4ca2ed4872bd9b7e48851e5573e
tree657ad2b317c6af46532d860011cf9fb94d999f51
parent1b0e5f4499a0c099d99b00a2a6a3edb45ae98660
merge-tree: only use basic merge config

Commit 9c93ba4d0ae (merge-recursive: honor diff.algorithm, 2024-07-13)
replaced init_merge_options() with init_basic_merge_config() for use in
plumbing commands and init_ui_merge_config() for use in porcelain
commands. As "git merge-tree" is a plumbing command it should call
init_basic_merge_config() rather than init_ui_merge_config(). The merge
ort machinery ignores "diff.algorithm" so the behavior is unchanged by
this commit but it future proofs us against any future changes to
init_ui_merge_config().

Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Acked-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/merge-tree.c