kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

merge-tree: only use basic merge config 

Commit 9c93ba4d0a (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>
maint
Phillip Wood 2025-02-18 16:24:37 +00:00 committed by Junio C Hamano
parent 1b0e5f4499
commit 54cf5d2da8
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/merge-tree.c
View File

@ -576,7 +576,7 @@ int cmd_merge_tree(int argc,
}; };


/* Init merge options */ /* Init merge options */
init_ui_merge_options(&o.merge_options, the_repository); init_basic_merge_options(&o.merge_options, the_repository);


/* Parse arguments */ /* Parse arguments */
original_argc = argc - 1; /* ignoring argv[0] */ original_argc = argc - 1; /* ignoring argv[0] */