X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=diff-index.c;h=e376d65f800c2b554308b60925eb0042d8f21cec;hb=08ddd4f7649ccf8b9f61c903de420bfd0a8a602e;hp=f8a102ec1665753e078798eaaac7aca48b845995;hpb=4abd89648eb40384556e2118e74be03325d0b05d;p=git.git diff --git a/diff-index.c b/diff-index.c index f8a102ec..e376d65f 100644 --- 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; }