diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-02-15 23:18:12 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-02-15 23:18:12 (GMT) |
| commit | ff19620f8127798dcfc1dab7c633eb7505b7abd3 (patch) | |
| tree | 951ce9d107d92af51782af584fbe812f1e00ed91 /merge-recursive.c | |
| parent | e17cec27d18c730dae738684d2f5df1dbd54a804 (diff) | |
| parent | fd48b464747c275b3d014b3f14d60d9ac19d184a (diff) | |
| download | git-ff19620f8127798dcfc1dab7c633eb7505b7abd3.zip git-ff19620f8127798dcfc1dab7c633eb7505b7abd3.tar.gz git-ff19620f8127798dcfc1dab7c633eb7505b7abd3.tar.bz2 | |
Merge branch 'jc/merge-symlink-ours-theirs' into maint
"git merge -Xours/-Xtheirs" learned to use our/their version when
resolving a conflicting updates to a symbolic link.
* jc/merge-symlink-ours-theirs:
merge: teach -Xours/-Xtheirs to symbolic link merge
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 0fc580d..cc5fa0a 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -1026,10 +1026,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"); } |