dilim/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-08-04 15:11:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jc/merge-recursive-gitlink'

Browse Source 
* jc/merge-recursive-gitlink:
  Support a merge with conflicting gitlink change
This commit is contained in:
Junio C Hamano
2007-12-12 16:52:59 -08:00
parent cfa97ae141 ff72af00f8
commit d9cf4ec9f7
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
git-merge-one-file.sh
View File

@@ -80,6 +80,10 @@ case "${1:-.}${2:-.}${3:-.}" in
echo "ERROR: $4: Not merging symbolic link changes."
exit 1
;;
*,160000,*)
echo "ERROR: $4: Not merging conflicting submodule changes."
exit 1
;;
esac
src2=`git-unpack-file $3`

10
merge-recursive.c
View File

@@ -1046,14 +1046,16 @@ static struct merge_file_info merge_file(struct diff_filespec *o,
free(result_buf.ptr);
result.clean = (merge_status == 0);
} else {
if (!(S_ISLNK(a->mode) || S_ISLNK(b->mode)))
die("cannot merge modes?");
} else if (S_ISGITLINK(a->mode)) {
result.clean = 0;
hashcpy(result.sha, a->sha1);
} else if (S_ISLNK(a->mode)) {
hashcpy(result.sha, a->sha1);
if (!sha_eq(a->sha1, b->sha1))
result.clean = 0;
} else {
die("unsupported object type in the tree");
}
}