diff options
| author | Phillip Wood <phillip.wood@dunelm.org.uk> | 2025-02-18 16:24:37 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-02-18 09:52:39 -0800 |
| commit | 54cf5d2da897d4ca2ed4872bd9b7e48851e5573e (patch) | |
| tree | 657ad2b317c6af46532d860011cf9fb94d999f51 /builtin/merge-tree.c | |
| parent | 1b0e5f4499a0c099d99b00a2a6a3edb45ae98660 (diff) | |
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>
Diffstat (limited to 'builtin/merge-tree.c')
| -rw-r--r-- | builtin/merge-tree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c index 3c73482f2b..3ec7127b3a 100644 --- 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] */ |