From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 26 May 2016 20:17:23 +0000 (-0700)
Subject: Merge branch 'js/windows-dotgit' into maint
X-Git-Tag: v2.9.0-rc1~12^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e29300d69fb8e003b36f155a5f286d72ee5a557f;p=thirdparty%2Fgit.git

Merge branch 'js/windows-dotgit' into maint

On Windows, .git and optionally any files whose name starts with a
dot are now marked as hidden, with a core.hideDotFiles knob to
customize this behaviour.

* js/windows-dotgit:
  mingw: remove unnecessary definition
  mingw: introduce the 'core.hideDotFiles' setting
---

e29300d69fb8e003b36f155a5f286d72ee5a557f
diff --cc environment.c
index 57acb2fe2a,646f384aa9..96160a75a5
--- a/environment.c
+++ b/environment.c
@@@ -62,7 -64,9 +62,8 @@@ int grafts_replace_parents = 1
  int core_apply_sparse_checkout;
  int merge_log_config = -1;
  int precomposed_unicode = -1; /* see probe_utf8_pathname_composition() */
 -struct startup_info *startup_info;
  unsigned long pack_size_limit_cfg;
+ enum hide_dotfiles_type hide_dotfiles = HIDE_DOTFILES_DOTGITONLY;
  
  #ifndef PROTECT_HFS_DEFAULT
  #define PROTECT_HFS_DEFAULT 0