diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-09-26 02:40:42 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-01-03 19:26:59 (GMT) |
| commit | fd48b464747c275b3d014b3f14d60d9ac19d184a (patch) | |
| tree | c3108f46efe831642bc1edfbc83a452b943698b3 /merge-recursive.c | |
| parent | 94c9fd268d4287f6fbfef84793288479905a7e48 (diff) | |
| download | git-fd48b464747c275b3d014b3f14d60d9ac19d184a.zip git-fd48b464747c275b3d014b3f14d60d9ac19d184a.tar.gz git-fd48b464747c275b3d014b3f14d60d9ac19d184a.tar.bz2 | |
merge: teach -Xours/-Xtheirs to symbolic link merge
The -Xours/-Xtheirs merge options were originally defined as a way
to "force" the resolution of 3way textual merge conflicts to take
one side without using your editor, hence did not even trigger in
situations where you would normally not get the <<< === >>> conflict
markers.
This was improved for binary files back in 2012 with a944af1d
("merge: teach -Xours/-Xtheirs to binary ll-merge driver",
2012-09-08).
Teach a similar trick to the codepath that deals with merging two
conflicting changes to symbolic links.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tested-by: Yaroslav Halchenko <yoh@onerussian.com>
Reviewed-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index 1494ffd..ed529f2 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -1002,10 +1002,19 @@ static int merge_file_1(struct merge_options *o, &b->oid, !o->call_depth); } else if (S_ISLNK(a->mode)) { - oidcpy(&result->oid, &a->oid); - - if (!oid_eq(&a->oid, &b->oid)) - result->clean = 0; + switch (o->recursive_variant) { + case MERGE_RECURSIVE_NORMAL: + oidcpy(&result->oid, &a->oid); + if (!oid_eq(&a->oid, &b->oid)) + result->clean = 0; + break; + case MERGE_RECURSIVE_OURS: + oidcpy(&result->oid, &a->oid); + break; + case MERGE_RECURSIVE_THEIRS: + oidcpy(&result->oid, &b->oid); + break; + } } else die("BUG: unsupported object type in the tree"); } |