git-commit -s: no extra space when sign-offs appear at the end already.

[thirdparty/git.git] / builtin-update-index.c

diff --git a/builtin-update-index.c b/builtin-update-index.c
index 09214c8a11e6afb927ab6da1aa3f0be5e50888c8..182331d34156dd6b88d16a068efad591e07ae6b3 100644 (file)
--- a/builtin-update-index.c
+++ b/builtin-update-index.c
@@ -112,11 +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.
+                * from it, otherwise assume unexecutable.
                 */
                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);
        }
 
        if (index_path(ce->sha1, path, &st, !info_only))