From a249a9b5a26e841a28f6e993a560d749303cf91c Mon Sep 17 00:00:00 2001 From: Johannes Sixt Date: Sat, 3 Mar 2007 20:38:00 +0100 Subject: [PATCH] Tell multi-parent diff about core.symlinks. When core.symlinks is false, and a merge of symbolic links had conflicts, the merge result is left as a file in the working directory. A decision must be made whether the file is treated as a regular file or as a symbolic link. This patch treats the file as a symbolic link only if all merge parents were also symbolic links. Signed-off-by: Johannes Sixt Signed-off-by: Junio C Hamano --- combine-diff.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/combine-diff.c b/combine-diff.c index 9daa0cb9a..6d928f282 100644 --- a/combine-diff.c +++ b/combine-diff.c @@ -699,8 +699,18 @@ static void show_patch_diff(struct combine_diff_path *elem, int num_parent, !fstat(fd, &st)) { size_t len = st.st_size; size_t sz = 0; + int is_file, i; elem->mode = canon_mode(st.st_mode); + /* if symlinks don't work, assume symlink if all parents + * are symlinks + */ + is_file = has_symlinks; + for (i = 0; !is_file && i < num_parent; i++) + is_file = !S_ISLNK(elem->parent[i].mode); + if (!is_file) + elem->mode = canon_mode(S_IFLNK); + result_size = len; result = xmalloc(len + 1); while (sz < len) { -- 2.30.2