projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
include header to define uint32_t, necessary on Mac OS X
[git.git]
/
diff-index.c
diff --git
a/diff-index.c
b/diff-index.c
index
f8a102e
..
e376d65
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;
}
}
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 (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;
}
mode = ce->ce_mode;
sha1 = no_sha1;
}