diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-02-17 06:43:48 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-02-17 06:56:06 (GMT) |
| commit | 185c975faaa790a98a4e00f124461473283500d6 (patch) | |
| tree | 093c04e201a8bbddfbe2e22b734a458a9505a0ec /builtin-update-index.c | |
| parent | f44213258de3fbef932f9c655213202f69dccc80 (diff) | |
| download | git-185c975faaa790a98a4e00f124461473283500d6.zip git-185c975faaa790a98a4e00f124461473283500d6.tar.gz git-185c975faaa790a98a4e00f124461473283500d6.tar.bz2 | |
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-update-index.c')
| -rw-r--r-- | builtin-update-index.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/builtin-update-index.c b/builtin-update-index.c index 1ac613a..772aaba 100644 --- a/builtin-update-index.c +++ b/builtin-update-index.c @@ -109,16 +109,17 @@ static int add_file_to_cache(const char *path) ce->ce_flags = htons(namelen); fill_stat_cache_info(ce, &st); - ce->ce_mode = create_ce_mode(st.st_mode); - if (!trust_executable_bit) { + if (trust_executable_bit) + ce->ce_mode = create_ce_mode(st.st_mode); + else { /* If there is an existing entry, pick the mode bits * from it, otherwise assume unexecutable. */ + struct cache_entry *ent; int pos = cache_name_pos(path, namelen); - if (0 <= pos) - ce->ce_mode = active_cache[pos]->ce_mode; - else if (S_ISREG(st.st_mode)) - ce->ce_mode = create_ce_mode(S_IFREG | 0666); + + ent = (0 <= pos) ? active_cache[pos] : NULL; + ce->ce_mode = ce_mode_from_stat(ent, st.st_mode); } if (index_path(ce->sha1, path, &st, !info_only)) |