mirror of
https://github.com/git/git.git
synced 2024-05-25 13:36:10 +02:00
merge-recursive: rename MERGE_RECURSIVE_* to MERGE_VARIANT_*
I want to implement the same outward facing API as found within merge-recursive.h in a different merge strategy. However, that makes names like MERGE_RECURSIVE_{NORMAL,OURS,THEIRS} look a little funny; rename to MERGE_VARIANT_{NORMAL,OURS,THEIRS}. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
5bf7e5779e
commit
f3081dae01
|
@ -1045,10 +1045,10 @@ static int merge_3way(struct merge_options *opt,
|
||||||
ll_opts.variant = 0;
|
ll_opts.variant = 0;
|
||||||
} else {
|
} else {
|
||||||
switch (opt->recursive_variant) {
|
switch (opt->recursive_variant) {
|
||||||
case MERGE_RECURSIVE_OURS:
|
case MERGE_VARIANT_OURS:
|
||||||
ll_opts.variant = XDL_MERGE_FAVOR_OURS;
|
ll_opts.variant = XDL_MERGE_FAVOR_OURS;
|
||||||
break;
|
break;
|
||||||
case MERGE_RECURSIVE_THEIRS:
|
case MERGE_VARIANT_THEIRS:
|
||||||
ll_opts.variant = XDL_MERGE_FAVOR_THEIRS;
|
ll_opts.variant = XDL_MERGE_FAVOR_THEIRS;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
@ -1355,15 +1355,15 @@ static int merge_mode_and_contents(struct merge_options *opt,
|
||||||
&b->oid);
|
&b->oid);
|
||||||
} else if (S_ISLNK(a->mode)) {
|
} else if (S_ISLNK(a->mode)) {
|
||||||
switch (opt->recursive_variant) {
|
switch (opt->recursive_variant) {
|
||||||
case MERGE_RECURSIVE_NORMAL:
|
case MERGE_VARIANT_NORMAL:
|
||||||
oidcpy(&result->blob.oid, &a->oid);
|
oidcpy(&result->blob.oid, &a->oid);
|
||||||
if (!oid_eq(&a->oid, &b->oid))
|
if (!oid_eq(&a->oid, &b->oid))
|
||||||
result->clean = 0;
|
result->clean = 0;
|
||||||
break;
|
break;
|
||||||
case MERGE_RECURSIVE_OURS:
|
case MERGE_VARIANT_OURS:
|
||||||
oidcpy(&result->blob.oid, &a->oid);
|
oidcpy(&result->blob.oid, &a->oid);
|
||||||
break;
|
break;
|
||||||
case MERGE_RECURSIVE_THEIRS:
|
case MERGE_VARIANT_THEIRS:
|
||||||
oidcpy(&result->blob.oid, &b->oid);
|
oidcpy(&result->blob.oid, &b->oid);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -3795,9 +3795,9 @@ int parse_merge_opt(struct merge_options *opt, const char *s)
|
||||||
if (!s || !*s)
|
if (!s || !*s)
|
||||||
return -1;
|
return -1;
|
||||||
if (!strcmp(s, "ours"))
|
if (!strcmp(s, "ours"))
|
||||||
opt->recursive_variant = MERGE_RECURSIVE_OURS;
|
opt->recursive_variant = MERGE_VARIANT_OURS;
|
||||||
else if (!strcmp(s, "theirs"))
|
else if (!strcmp(s, "theirs"))
|
||||||
opt->recursive_variant = MERGE_RECURSIVE_THEIRS;
|
opt->recursive_variant = MERGE_VARIANT_THEIRS;
|
||||||
else if (!strcmp(s, "subtree"))
|
else if (!strcmp(s, "subtree"))
|
||||||
opt->subtree_shift = "";
|
opt->subtree_shift = "";
|
||||||
else if (skip_prefix(s, "subtree=", &arg))
|
else if (skip_prefix(s, "subtree=", &arg))
|
||||||
|
|
|
@ -32,9 +32,9 @@ struct merge_options {
|
||||||
/* xdiff-related options (patience, ignore whitespace, ours/theirs) */
|
/* xdiff-related options (patience, ignore whitespace, ours/theirs) */
|
||||||
long xdl_opts;
|
long xdl_opts;
|
||||||
enum {
|
enum {
|
||||||
MERGE_RECURSIVE_NORMAL = 0,
|
MERGE_VARIANT_NORMAL = 0,
|
||||||
MERGE_RECURSIVE_OURS,
|
MERGE_VARIANT_OURS,
|
||||||
MERGE_RECURSIVE_THEIRS
|
MERGE_VARIANT_THEIRS
|
||||||
} recursive_variant;
|
} recursive_variant;
|
||||||
|
|
||||||
/* console output related options */
|
/* console output related options */
|
||||||
|
|
Loading…
Reference in New Issue