Merge branch 'maint'

diff --git a/diff-index.c b/diff-index.c
index 12a9418d6bbec35d2e5bc0010aff4366e63d7440..e376d65f800c2b554308b60925eb0042d8f21cec 100644 (file)
--- 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;
                }