diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-02-16 22:43:48 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-02-16 22:56:06 -0800 |
| commit | 185c975faaa790a98a4e00f124461473283500d6 (patch) | |
| tree | 093c04e201a8bbddfbe2e22b734a458a9505a0ec /builtin-apply.c | |
| parent | f44213258de3fbef932f9c655213202f69dccc80 (diff) | |
| download | git-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 'builtin-apply.c')
| -rw-r--r-- | builtin-apply.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-apply.c b/builtin-apply.c index 3fefdacd94..abe3538715 100644 --- a/builtin-apply.c +++ b/builtin-apply.c @@ -1988,7 +1988,7 @@ static int check_patch(struct patch *patch, struct patch *prev_patch) return error("%s: %s", old_name, strerror(errno)); if (!cached) - st_mode = ntohl(create_ce_mode(st.st_mode)); + st_mode = ntohl(ce_mode_from_stat(ce, st.st_mode)); if (patch->is_new < 0) patch->is_new = 0; |