From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 17 May 2016 21:38:39 +0000 (-0700)
Subject: Merge branch 'js/windows-dotgit'
X-Git-Tag: v2.9.0-rc0~18
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bfc99b63fe859e16ddcfcbe6ac09f98b8d06b34e;p=git

Merge branch 'js/windows-dotgit'

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
---

bfc99b63fe859e16ddcfcbe6ac09f98b8d06b34e
diff --cc environment.c
index 2857e3f366,646f384aa9..ca72464a98
--- a/environment.c
+++ b/environment.c
@@@ -63,7 -64,9 +63,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