X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=builtin-update-index.c;h=182331d34156dd6b88d16a068efad591e07ae6b3;hb=fffe694d607ea683b5d08ee99a46d9b06cb74006;hp=7f9c638466f79fee7d2914b8ec76d713c3670e7e;hpb=24ad8e0ce23d08d28a5d664ab6164b10125146ce;p=git.git diff --git a/builtin-update-index.c b/builtin-update-index.c index 7f9c63846..182331d34 100644 --- a/builtin-update-index.c +++ b/builtin-update-index.c @@ -112,13 +112,13 @@ static int add_file_to_cache(const char *path) ce->ce_mode = create_ce_mode(st.st_mode); if (!trust_executable_bit) { /* If there is an existing entry, pick the mode bits - * from it, otherwise force to 644. + * from it, otherwise assume unexecutable. */ int pos = cache_name_pos(path, namelen); if (0 <= pos) ce->ce_mode = active_cache[pos]->ce_mode; - else - ce->ce_mode = create_ce_mode(S_IFREG | 0644); + else if (S_ISREG(st.st_mode)) + ce->ce_mode = create_ce_mode(S_IFREG | 0666); } if (index_path(ce->sha1, path, &st, !info_only))