X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=compat%2Fcygwin.c;h=dfe9b3084ffbfd6c41a648e32a1857e78b566215;hb=d8308c79fc2cae2d1891f92b9e0f9ec0361fe7df;hp=b4a51b958c5651d3b509013aaef0c4e30b68a816;hpb=2c6b5d88287689e5a1acd5b5fefb8edd96931b6d;p=git.git

diff --git a/compat/cygwin.c b/compat/cygwin.c
index b4a51b958..dfe9b3084 100644
--- a/compat/cygwin.c
+++ b/compat/cygwin.c
@@ -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)
 {
@@ -114,8 +114,7 @@ static int git_cygwin_config(const char *var, const char *value, void *cb)
 
 static int init_stat(void)
 {
-	if (have_git_dir()) {
-		git_config(git_cygwin_config, NULL);
+	if (have_git_dir() && git_config(git_cygwin_config,NULL)) {
 		if (!core_filemode && native_stat) {
 			cygwin_stat_fn = cygwin_stat;
 			cygwin_lstat_fn = cygwin_lstat;