Derrick Stolee via GitGitGadget wrote: > From: Derrick Stolee <derrickstolee@xxxxxxxxxx> > > The 'git merge-tree' command handles creating root trees for merges > without using the worktree. This is a critical operation in many Git > hosts, as they typically store bare repositories. > > This builtin does not load the default Git config, which can have > several important ramifications. For the record, I had already sent a better version of this patch almost 2 years ago [1], not just for `git merge-tree`, but other commands as well. The obvious fix was completely ignored by the maintainer. The reason why it should be git_xmerge_config and not git_default_config, is that merge.conflictstyle would not be parsed if you call git_default_config. > diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c > index aa8040c2a6a..b8f8a8b5d9f 100644 > --- a/builtin/merge-tree.c > +++ b/builtin/merge-tree.c > @@ -17,6 +17,7 @@ > #include "merge-blobs.h" > #include "quote.h" > #include "tree.h" > +#include "config.h" > > static int line_termination = '\n'; > > @@ -628,6 +629,8 @@ int cmd_merge_tree(int argc, const char **argv, const char *prefix) > if (argc != expected_remaining_argc) > usage_with_options(merge_tree_usage, mt_options); > > + git_config(git_default_config, NULL); It should be git_xmerge_config. > + > /* Do the relevant type of merge */ > if (o.mode == MODE_REAL) > return real_merge(&o, merge_base, argv[0], argv[1], prefix); [1] https://lore.kernel.org/git/20210622002714.1720891-3-felipe.contreras@xxxxxxxxx/ -- Felipe Contreras
