From: Junio C Hamano <junkio@cox.net>
Date: Thu, 30 Mar 2006 07:00:42 +0000 (-0800)
Subject: assume unchanged git: diff-index fix.
X-Git-Tag: v1.3.0-rc2~29
X-Git-Url: https://git.octo.it/?p=git.git;a=commitdiff_plain;h=e464f4c3119b04712ab87329f3dd4d4f21b0a8a7

assume unchanged git: diff-index fix.

When the executable bit is untrustworthy and when we are
comparing the tree with the working tree, we tried to reuse the
mode bits recorded in the index incorrectly (the computation was
bogus on little endian architectures).  Just use mode from index
when it is a regular file.

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

diff --git a/diff-index.c b/diff-index.c
index 12a9418d..e376d65f 100644
--- a/diff-index.c
+++ b/diff-index.c
@@ -36,9 +36,7 @@ static int get_stat_data(struct cache_entry *ce,
 		changed = ce_match_stat(ce, &st, 0);
 		if (changed) {
 			mode = create_ce_mode(st.st_mode);
-			if (!trust_executable_bit &&
-			    S_ISREG(mode) && S_ISREG(ce->ce_mode) &&
-			    ((mode ^ ce->ce_mode) == 0111))
+			if (!trust_executable_bit && S_ISREG(st.st_mode))
 				mode = ce->ce_mode;
 			sha1 = no_sha1;
 		}