From e464f4c3119b04712ab87329f3dd4d4f21b0a8a7 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 29 Mar 2006 23:00:42 -0800 Subject: [PATCH] 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 --- diff-index.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/diff-index.c b/diff-index.c index 12a9418d6..e376d65f8 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; } -- 2.26.2