[PATCH v7 12/15] merge: use the "resolve" strategy without forking
From: Alban Gruin <hidden>
Date: 2021-03-17 20:57:41
Subsystem:
the rest · Maintainer:
Linus Torvalds
This teaches `git merge' to invoke the "resolve" strategy with a function call instead of forking. Signed-off-by: Alban Gruin <redacted> --- builtin/merge.c | 4 ++++ 1 file changed, 4 insertions(+)
diff --git a/builtin/merge.c b/builtin/merge.c
index eb00b273e6..87921497a2 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c@@ -43,6 +43,7 @@ #include "commit-reach.h" #include "wt-status.h" #include "commit-graph.h" +#include "merge-strategies.h" #define DEFAULT_TWOHEAD (1<<0) #define DEFAULT_OCTOPUS (1<<1)
@@ -755,6 +756,9 @@ static int try_merge_strategy(const char *strategy, struct commit_list *common, COMMIT_LOCK | SKIP_IF_UNCHANGED)) die(_("unable to write %s"), get_index_file()); return clean ? 0 : 1; + } else if (!strcmp(strategy, "resolve")) { + return merge_strategies_resolve(the_repository, common, + head_arg, remoteheads); } else { return try_merge_command(the_repository, strategy, xopts_nr, xopts,
--
2.31.0