From: Alban Gruin Date: Wed, 17 Mar 2021 20:49:37 GMT Subject: [PATCH v7 13/15] merge: use the "octopus" strategy without forking Message-ID: <20210317204939.17890-14-alban.gruin@gmail.com> In-Reply-To: <20210317204939.17890-1-alban.gruin@gmail.com> This teaches `git merge' to invoke the "octopus" strategy with a function call instead of forking. Signed-off-by: Alban Gruin --- 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