Merge branch 'bc/submodule-foreach-stdin-fix-1.7.4' into maint

diff --git a/compat/cygwin.c b/compat/cygwin.c
index 119287412d26dec68ed1c099aa449a6ea16b7bfd..ba3327f1f96922c91a4e3f0094c0fa10cde0301e 100644 (file)
--- a/compat/cygwin.c
+++ b/compat/cygwin.c
@@ -89,7 +89,7 @@ static int cygwin_stat(const char *path, struct stat *buf)
 /*
  * At start up, we are trying to determine whether Win32 API or cygwin stat
  * functions should be used. The choice is determined by core.ignorecygwinfstricks.
- * Reading this option is not always possible immediately as git_dir may be
+ * Reading this option is not always possible immediately as git_dir may
  * not be set yet. So until it is set, use cygwin lstat/stat functions.
  * However, if core.filemode is set, we must use the Cygwin posix
  * stat/lstat as the Windows stat functions do not determine posix filemode.
@@ -101,7 +101,7 @@ static int cygwin_stat(const char *path, struct stat *buf)
  * and calling git_default_config() from here would break such variables.
  */
 static int native_stat = 1;
-static int core_filemode;
+static int core_filemode = 1; /* matches trust_executable_bit default */
 
 static int git_cygwin_config(const char *var, const char *value, void *cb)
 {