Subject: [PATCH v8 12/14] merge: use the "octopus" strategy without forking

From: Alban Gruin <[email-masked]>
Date: Tue, 9 Aug 2022 20:54:27 +0200

This teaches `git merge' to invoke the "octopus" strategy with a
function call instead of forking.

Signed-off-by: Alban Gruin <[email-masked]>
---
 builtin/merge.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/builtin/merge.c b/builtin/merge.c
index 0ab2993ab2..a44a6b810b 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -778,6 +778,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.37.1.412.gcfdce49ffd