X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=merge-index.c;h=7027d7865971646f178690a150246d9bc4d674c0;hb=0053e902b4f777ba454b62263d3695e5292b1559;hp=a9983dd78ad5cd1e364f0e00c259bdb7e6f151f0;hpb=240897e908e48e8f8c8d5555522afe255b3b734b;p=git.git

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);