mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/merge-symlink-ours-theirs' into maint

Browse Source 
"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
This commit is contained in:
Junio C Hamano
2018-02-15 15:18:12 -08:00
parent e17cec27d1 fd48b46474
commit ff19620f81
2 changed files with 45 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
merge-recursive.c
View File

@ -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");
}