X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin-update-index.c;h=71cef633c0e36b3a33fa29eccb8579a9304b0777;hb=3a81b9f571a6b7edd83b3d5f27c3c95d9b1c9d5c;hp=65246dad8d075de3f77454494c419000288c9ed2;hpb=8ab3e1858676b91bf351537b8afd5599c6640e6f;p=git.git

diff --git a/builtin-update-index.c b/builtin-update-index.c
index 65246dad8..71cef633c 100644
--- a/builtin-update-index.c
+++ b/builtin-update-index.c
@@ -109,11 +109,11 @@ static int add_file_to_cache(const char *path)
 	ce->ce_flags = htons(namelen);
 	fill_stat_cache_info(ce, &st);
 
-	if (trust_executable_bit)
+	if (trust_executable_bit && has_symlinks)
 		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.
+		/* If there is an existing entry, pick the mode bits and type
+		 * from it, otherwise assume unexecutable regular file.
 		 */
 		struct cache_entry *ent;
 		int pos = cache_name_pos(path, namelen);