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>
This commit is contained in:
@ -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;
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user