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>

diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c
index 3c73482f2b0c59d0ced84e34918d6dbda61f3e66..3ec7127b3a6b3f536b647e66ba3fec9c54516499 100644 (file)
--- a/builtin/merge-tree.c
+++ b/builtin/merge-tree.c
@@ -576,7 +576,7 @@ int cmd_merge_tree(int argc,
        };
 
        /* Init merge options */
-       init_ui_merge_options(&o.merge_options, the_repository);
+       init_basic_merge_options(&o.merge_options, the_repository);
 
        /* Parse arguments */
        original_argc = argc - 1; /* ignoring argv[0] */