From: Junio C Hamano <junkio@cox.net>
Date: Mon, 26 Feb 2007 02:17:15 +0000 (-0800)
Subject: merge-index: fix longstanding bug in merging symlinks
X-Git-Tag: v1.5.0.2~4^2~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=308efc10d890265a4c62a8b58f025aaf8a1f244d;p=git.git

merge-index: fix longstanding bug in merging symlinks

Ancient commit e2b6a9d0 added code to pass "file modes" from
merge-index to merge-one-file, and then later commit 54dd99a1
wanted to make sure we do not end up creating a nonsense symlink
that points at a path whose name contains conflict markers.

However, nobody noticed that the code in merge-index added by
e2b6a9d0 were stripping the S_IFMT bits and the code in 54dd99a1
was meaningless.  This fixes it.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/merge-index.c b/merge-index.c
index a9983dd78..7027d7865 100644
--- a/merge-index.c
+++ b/merge-index.c
@@ -60,7 +60,7 @@ static int merge_entry(int pos, const char *path)
 			break;
 		found++;
 		strcpy(hexbuf[stage], sha1_to_hex(ce->sha1));
-		sprintf(ownbuf[stage], "%o", ntohl(ce->ce_mode) & (~S_IFMT));
+		sprintf(ownbuf[stage], "%o", ntohl(ce->ce_mode));
 		arguments[stage] = hexbuf[stage];
 		arguments[stage + 4] = ownbuf[stage];
 	} while (++pos < active_nr);