summaryrefslogtreecommitdiff
path: root/config.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-12-17 11:20:31 -0800
committerJunio C Hamano <gitster@pobox.com>2014-12-17 11:20:31 -0800
commit6898b797218ca1f25818d813318b387d965dc1bb (patch)
treeeb41620da7ea49019cb97161646318f54225d647 /config.c
parent9181365b856a63f8c5486ad0fe48f1cd60852da3 (diff)
parent5c8213a7696b3d9e29feda2516e350d03d7bd9a4 (diff)
downloadgit-6898b797218ca1f25818d813318b387d965dc1bb.tar.gz
Sync with v1.8.5.6
* maint-1.8.5: Git 1.8.5.6 fsck: complain about NTFS ".git" aliases in trees read-cache: optionally disallow NTFS .git variants path: add is_ntfs_dotgit() helper fsck: complain about HFS+ ".git" aliases in trees read-cache: optionally disallow HFS+ .git variants utf8: add is_hfs_dotgit() helper fsck: notice .git case-insensitively t1450: refactor ".", "..", and ".git" fsck tests verify_dotfile(): reject .git case-insensitively read-tree: add tests for confusing paths like ".." and ".git" unpack-trees: propagate errors adding entries to the index
Diffstat (limited to 'config.c')
-rw-r--r--config.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/config.c b/config.c
index 314d8ee740..8984ad20c7 100644
--- a/config.c
+++ b/config.c
@@ -885,6 +885,16 @@ static int git_default_core_config(const char *var, const char *value)
return 0;
}
+ if (!strcmp(var, "core.protecthfs")) {
+ protect_hfs = git_config_bool(var, value);
+ return 0;
+ }
+
+ if (!strcmp(var, "core.protectntfs")) {
+ protect_ntfs = git_config_bool(var, value);
+ return 0;
+ }
+
/* Add other config variables here and to Documentation/config.txt. */
return 0;
}