summaryrefslogtreecommitdiff
path: root/diff-lib.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-02-16 22:43:48 -0800
committerJunio C Hamano <junkio@cox.net>2007-02-16 22:56:06 -0800
commit185c975faaa790a98a4e00f124461473283500d6 (patch)
tree093c04e201a8bbddfbe2e22b734a458a9505a0ec /diff-lib.c
parentf44213258de3fbef932f9c655213202f69dccc80 (diff)
downloadgit-185c975faaa790a98a4e00f124461473283500d6.tar.gz
Do not take mode bits from index after type change.
When we do not trust executable bit from lstat(2), we copied existing ce_mode bits without checking if the filesystem object is a regular file (which is the only thing we apply the "trust executable bit" business) nor if the blob in the index is a regular file (otherwise, we should do the same as registering a new regular file, which is to default non-executable). Noticed by Johannes Sixt. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'diff-lib.c')
-rw-r--r--diff-lib.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/diff-lib.c b/diff-lib.c
index 91cd87742f..556d5345bf 100644
--- a/diff-lib.c
+++ b/diff-lib.c
@@ -170,9 +170,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(st.st_mode))
- mode = ce->ce_mode;
+ mode = ce_mode_from_stat(ce, st.st_mode);
sha1 = no_sha1;
}
}