[PATCH 3/5] merge-tree: only use basic merge config
- From
- Phillip Wood via GitGitGadget <gitgitgadget@gmail.com>
- Date
- Feb 16, 2025, 16:37 UTC
- Message-ID
- <bf1dc603a153ed9e8a3e7b708ec99877048ab3e3.1739723830.git.gitgitgadget@gmail.com>
- In-Reply-To
- <pull.1862.git.1739723829.gitgitgadget@gmail.com>
From: Phillip Wood <phillip.wood@dunelm.org.uk>
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> --- builtin/merge-tree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c index 3c73482f2b0..3ec7127b3a6 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] */
-- gitgitgadget