[PATCH v7 13/15] merge: use the "octopus" strategy without forking
From: Alban Gruin <hidden>
Date: 2021-03-17 20:57:42
Subsystem:
the rest · Maintainer:
Linus Torvalds
This teaches `git merge' to invoke the "octopus" strategy with a function call instead of forking. Signed-off-by: Alban Gruin <redacted> --- builtin/merge.c | 3 +++ 1 file changed, 3 insertions(+)
diff --git a/builtin/merge.c b/builtin/merge.c
index 87921497a2..79f1e8bdd1 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c@@ -759,6 +759,9 @@ static int try_merge_strategy(const char *strategy, struct commit_list *common, } else if (!strcmp(strategy, "resolve")) { return merge_strategies_resolve(the_repository, common, head_arg, remoteheads); + } else if (!strcmp(strategy, "octopus")) { + return merge_strategies_octopus(the_repository, common, + head_arg, remoteheads); } else { return try_merge_command(the_repository, strategy, xopts_nr, xopts,
--
2.31.0