From: Christian Couder Date: Wed, 31 Mar 2010 19:22:08 GMT Subject: [PATCH 5/5] revert: add "--strategy" option to choose merge strategy Message-ID: <20100331192209.5827.9117.chriscool@tuxfamily.org> In-Reply-To: <20100331192014.5827.90637.chriscool@tuxfamily.org> This patch makes it possible to use a different merge strategy when cherry-picking. This is usefull mainly for debugging purposes as it allows to see if some failures are caused by the merge strategy used or not. Signed-off-by: Christian Couder --- builtin/revert.c | 25 +++++++++++++++++++++++-- 1 files changed, 23 insertions(+), 2 deletions(-) diff --git a/builtin/revert.c b/builtin/revert.c index 8219ee2..bbaa937 100644 --- a/builtin/revert.c +++ b/builtin/revert.c @@ -43,6 +43,7 @@ static const char *commit_name; static int allow_rerere_auto; static const char *me; +static const char *strategy; #define GIT_REFLOG_ACTION "GIT_REFLOG_ACTION" @@ -62,6 +63,7 @@ static void parse_args(int argc, const char **argv) OPT_BOOLEAN('s', "signoff", &signoff, "add Signed-off-by:"), OPT_INTEGER('m', "mainline", &mainline, "parent number"), OPT_RERERE_AUTOUPDATE(&allow_rerere_auto), + OPT_STRING(0, "strategy", &strategy, "strategy", "merge strategy"), OPT_END(), OPT_END(), OPT_END(), @@ -483,8 +485,27 @@ static int revert_or_cherry_pick(int argc, const char **argv) } } - do_recursive_merge(base, next, base_label, next_label, - head, &msgbuf, defmsg); + if (!strategy || !strcmp(strategy, "recursive") || action == REVERT) + do_recursive_merge(base, next, base_label, next_label, + head, &msgbuf, defmsg); + else { + int res; + struct commit_list *common = NULL; + struct commit_list *remotes = NULL; + write_message(&msgbuf, defmsg); + commit_list_insert(base, &common); + commit_list_insert(next, &remotes); + res = try_merge_command(strategy, common, + sha1_to_hex(head), remotes); + free_commit_list(common); + free_commit_list(remotes); + if (res) { + fprintf(stderr, "Automatic %s with strategy %s failed.%s\n", + me, strategy, help_msg(commit_name)); + rerere(allow_rerere_auto); + exit(1); + } + } /* * -- 1.7.0.3.454.gd9aeb