summaryrefslogtreecommitdiff
path: root/config.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-05-26 20:17:23 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-05-26 20:17:23 (GMT)
commite29300d69fb8e003b36f155a5f286d72ee5a557f (patch)
treed22a3ff686090407694d7e87bb3bf9901b3951db /config.c
parent968004c39c65e8a5d1a0b86af75fcf16a5eb6835 (diff)
parentebf31e70bbea010c9bb505578ae29532445b5a4d (diff)
downloadgit-e29300d69fb8e003b36f155a5f286d72ee5a557f.zip
git-e29300d69fb8e003b36f155a5f286d72ee5a557f.tar.gz
git-e29300d69fb8e003b36f155a5f286d72ee5a557f.tar.bz2
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
Diffstat (limited to 'config.c')
-rw-r--r--config.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/config.c b/config.c
index 4c9b447..adf12a1 100644
--- a/config.c
+++ b/config.c
@@ -912,6 +912,14 @@ static int git_default_core_config(const char *var, const char *value)
return 0;
}
+ if (!strcmp(var, "core.hidedotfiles")) {
+ if (value && !strcasecmp(value, "dotgitonly"))
+ hide_dotfiles = HIDE_DOTFILES_DOTGITONLY;
+ else
+ hide_dotfiles = git_config_bool(var, value);
+ return 0;
+ }
+
/* Add other config variables here and to Documentation/config.txt. */
return 0;
}