[PATCH v4 10/12] merge: use the "octopus" strategy without forking
- From
Alban Gruin <alban.gruin@gmail.com>
- Date
- Nov 13, 2020, 11:04 UTC
- Message-ID
- <20201113110428.21265-11-alban.gruin@gmail.com>
- In-Reply-To
- <20201113110428.21265-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 <alban.gruin@gmail.com> --- builtin/merge.c | 3 +++ 1 file changed, 3 insertions(+)
diff --git a/builtin/merge.c b/builtin/merge.c index ddfefd8ce3..02a2367647 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -744,6 +744,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.20.1