From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 13 Jul 2011 21:31:36 +0000 (-0700)
Subject: Merge branch 'jc/maint-cygwin-trust-executable-bit-default'
X-Git-Tag: v1.7.7-rc0~101
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/df9b29ce82ba24729d5431f5e9751470e3a44f25?ds=inline;hp=-c

Merge branch 'jc/maint-cygwin-trust-executable-bit-default'

* jc/maint-cygwin-trust-executable-bit-default:
cygwin: trust executable bit by default
---

df9b29ce82ba24729d5431f5e9751470e3a44f25
diff --combined compat/cygwin.c
index b38dbd7f8f,ba3327f1f9..dfe9b3084f
--- a/compat/cygwin.c
+++ b/compat/cygwin.c
@@@ -101,7 -101,7 +101,7 @@@ static int cygwin_stat(const char *path
   * 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,7 -114,8 +114,7 @@@
  
  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;