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>
Elijah Newren committed
Aug 17, 2019 at 11:41 UTC
f3081dae014e08ece75cfb28a9844beb01b6d9f2
2 files changed
+10
-10
merge-recursive.c
+7
-7
@@ -1045,10 +1045,10 @@ static int merge_3way(struct merge_options *opt,
1045
ll_opts.variant = 0;
1046
} else {
1047
switch (opt->recursive_variant) {
1048
- case MERGE_RECURSIVE_OURS:
1048
+ case MERGE_VARIANT_OURS:
1049
ll_opts.variant = XDL_MERGE_FAVOR_OURS;
1050
break;
1051
- case MERGE_RECURSIVE_THEIRS:
1051
+ case MERGE_VARIANT_THEIRS:
1052
ll_opts.variant = XDL_MERGE_FAVOR_THEIRS;
1053
break;
1054
default:
@@ -1355,15 +1355,15 @@ static int merge_mode_and_contents(struct merge_options *opt,
1355
&b->oid);
1356
} else if (S_ISLNK(a->mode)) {
1357
switch (opt->recursive_variant) {
1358
- case MERGE_RECURSIVE_NORMAL:
1358
+ case MERGE_VARIANT_NORMAL:
1359
oidcpy(&result->blob.oid, &a->oid);
1360
if (!oid_eq(&a->oid, &b->oid))
1361
result->clean = 0;
1362
break;
1363
- case MERGE_RECURSIVE_OURS:
1363
+ case MERGE_VARIANT_OURS:
1364
oidcpy(&result->blob.oid, &a->oid);
1365
break;
1366
- case MERGE_RECURSIVE_THEIRS:
1366
+ case MERGE_VARIANT_THEIRS:
1367
oidcpy(&result->blob.oid, &b->oid);
1368
break;
1369
}
@@ -3795,9 +3795,9 @@ int parse_merge_opt(struct merge_options *opt, const char *s)
3795
if (!s || !*s)
3796
return -1;
3797
if (!strcmp(s, "ours"))
3798
- opt->recursive_variant = MERGE_RECURSIVE_OURS;
3798
+ opt->recursive_variant = MERGE_VARIANT_OURS;
3799
else if (!strcmp(s, "theirs"))
3800
- opt->recursive_variant = MERGE_RECURSIVE_THEIRS;
3800
+ opt->recursive_variant = MERGE_VARIANT_THEIRS;
3801
else if (!strcmp(s, "subtree"))
3802
opt->subtree_shift = "";
3803
else if (skip_prefix(s, "subtree=", &arg))
merge-recursive.h
+3
-3
@@ -32,9 +32,9 @@ struct merge_options {
32
/* xdiff-related options (patience, ignore whitespace, ours/theirs) */
33
long xdl_opts;
34
enum {
35
- MERGE_RECURSIVE_NORMAL = 0,
36
- MERGE_RECURSIVE_OURS,
37
- MERGE_RECURSIVE_THEIRS
35
+ MERGE_VARIANT_NORMAL = 0,
36
+ MERGE_VARIANT_OURS,
37
+ MERGE_VARIANT_THEIRS
38
} recursive_variant;
39
40
/* console output related options */