Merge branch 'jc/maint-cygwin-trust-executable-bit-default'
authorJunio C Hamano <gitster@pobox.com>
Wed, 13 Jul 2011 21:31:36 +0000 (14:31 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 13 Jul 2011 21:31:36 +0000 (14:31 -0700)
* jc/maint-cygwin-trust-executable-bit-default:
cygwin: trust executable bit by default

1  2 
compat/cygwin.c
diff --combined compat/cygwin.c
index b38dbd7f8fb557b3cf70aef29ec173afc106d5fc,ba3327f1f96922c91a4e3f0094c0fa10cde0301e..dfe9b3084ffbfd6c41a648e32a1857e78b566215
@@@ -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)
  {
  
  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;