merge-recursive: expose merge options for builtin merge
There are two very similar blocks of code that recognize options for the "recursive" merge strategy. Unify them. No functional change intended. Cc: Avery Pennarun <apenwarr@gmail.com> Helped-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
7610fa57e6
commit
635a7bb1d8
@ -37,19 +37,7 @@ int cmd_merge_recursive(int argc, const char **argv, const char *prefix)
|
|||||||
if (!prefixcmp(arg, "--")) {
|
if (!prefixcmp(arg, "--")) {
|
||||||
if (!arg[2])
|
if (!arg[2])
|
||||||
break;
|
break;
|
||||||
if (!strcmp(arg+2, "ours"))
|
if (parse_merge_opt(&o, arg + 2))
|
||||||
o.recursive_variant = MERGE_RECURSIVE_OURS;
|
|
||||||
else if (!strcmp(arg+2, "theirs"))
|
|
||||||
o.recursive_variant = MERGE_RECURSIVE_THEIRS;
|
|
||||||
else if (!strcmp(arg+2, "subtree"))
|
|
||||||
o.subtree_shift = "";
|
|
||||||
else if (!prefixcmp(arg+2, "subtree="))
|
|
||||||
o.subtree_shift = arg + 10;
|
|
||||||
else if (!strcmp(arg+2, "renormalize"))
|
|
||||||
o.renormalize = 1;
|
|
||||||
else if (!strcmp(arg+2, "no-renormalize"))
|
|
||||||
o.renormalize = 0;
|
|
||||||
else
|
|
||||||
die("Unknown option %s", arg);
|
die("Unknown option %s", arg);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
@ -629,25 +629,9 @@ static int try_merge_strategy(const char *strategy, struct commit_list *common,
|
|||||||
|
|
||||||
o.renormalize = option_renormalize;
|
o.renormalize = option_renormalize;
|
||||||
|
|
||||||
/*
|
for (x = 0; x < xopts_nr; x++)
|
||||||
* NEEDSWORK: merge with table in builtin/merge-recursive
|
if (parse_merge_opt(&o, xopts[x]))
|
||||||
*/
|
|
||||||
for (x = 0; x < xopts_nr; x++) {
|
|
||||||
if (!strcmp(xopts[x], "ours"))
|
|
||||||
o.recursive_variant = MERGE_RECURSIVE_OURS;
|
|
||||||
else if (!strcmp(xopts[x], "theirs"))
|
|
||||||
o.recursive_variant = MERGE_RECURSIVE_THEIRS;
|
|
||||||
else if (!strcmp(xopts[x], "subtree"))
|
|
||||||
o.subtree_shift = "";
|
|
||||||
else if (!prefixcmp(xopts[x], "subtree="))
|
|
||||||
o.subtree_shift = xopts[x]+8;
|
|
||||||
else if (!strcmp(xopts[x], "renormalize"))
|
|
||||||
o.renormalize = 1;
|
|
||||||
else if (!strcmp(xopts[x], "no-renormalize"))
|
|
||||||
o.renormalize = 0;
|
|
||||||
else
|
|
||||||
die("Unknown option for merge-recursive: -X%s", xopts[x]);
|
die("Unknown option for merge-recursive: -X%s", xopts[x]);
|
||||||
}
|
|
||||||
|
|
||||||
o.branch1 = head_arg;
|
o.branch1 = head_arg;
|
||||||
o.branch2 = remoteheads->item->util;
|
o.branch2 = remoteheads->item->util;
|
||||||
|
@ -1499,3 +1499,24 @@ void init_merge_options(struct merge_options *o)
|
|||||||
memset(&o->current_directory_set, 0, sizeof(struct string_list));
|
memset(&o->current_directory_set, 0, sizeof(struct string_list));
|
||||||
o->current_directory_set.strdup_strings = 1;
|
o->current_directory_set.strdup_strings = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int parse_merge_opt(struct merge_options *o, const char *s)
|
||||||
|
{
|
||||||
|
if (!s || !*s)
|
||||||
|
return -1;
|
||||||
|
if (!strcmp(s, "ours"))
|
||||||
|
o->recursive_variant = MERGE_RECURSIVE_OURS;
|
||||||
|
else if (!strcmp(s, "theirs"))
|
||||||
|
o->recursive_variant = MERGE_RECURSIVE_THEIRS;
|
||||||
|
else if (!strcmp(s, "subtree"))
|
||||||
|
o->subtree_shift = "";
|
||||||
|
else if (!prefixcmp(s, "subtree="))
|
||||||
|
o->subtree_shift = s + strlen("subtree=");
|
||||||
|
else if (!strcmp(s, "renormalize"))
|
||||||
|
o->renormalize = 1;
|
||||||
|
else if (!strcmp(s, "no-renormalize"))
|
||||||
|
o->renormalize = 0;
|
||||||
|
else
|
||||||
|
return -1;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
@ -55,6 +55,8 @@ int merge_recursive_generic(struct merge_options *o,
|
|||||||
void init_merge_options(struct merge_options *o);
|
void init_merge_options(struct merge_options *o);
|
||||||
struct tree *write_tree_from_memory(struct merge_options *o);
|
struct tree *write_tree_from_memory(struct merge_options *o);
|
||||||
|
|
||||||
|
int parse_merge_opt(struct merge_options *out, const char *s);
|
||||||
|
|
||||||
/* builtin/merge.c */
|
/* builtin/merge.c */
|
||||||
int try_merge_command(const char *strategy, struct commit_list *common, const char *head_arg, struct commit_list *remotes);
|
int try_merge_command(const char *strategy, struct commit_list *common, const char *head_arg, struct commit_list *remotes);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user