Log message printout cleanups (#3): fix --pretty=oneline

diff --git a/diff-index.c b/diff-index.c
index f8a102ec1665753e078798eaaac7aca48b845995..e376d65f800c2b554308b60925eb0042d8f21cec 100644 (file)
--- a/diff-index.c
+++ b/diff-index.c
@@ -33,12 +33,10 @@ static int get_stat_data(struct cache_entry *ce,
                        }
                        return -1;
                }
-               changed = ce_match_stat(ce, &st);
+               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;
                }