summaryrefslogtreecommitdiff
path: root/environment.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 /environment.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 'environment.c')
-rw-r--r--environment.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/environment.c b/environment.c
index 4a3437d8a6..39a8c6c343 100644
--- a/environment.c
+++ b/environment.c
@@ -64,6 +64,16 @@ int precomposed_unicode = -1; /* see probe_utf8_pathname_composition() */
struct startup_info *startup_info;
unsigned long pack_size_limit_cfg;
+#ifndef PROTECT_HFS_DEFAULT
+#define PROTECT_HFS_DEFAULT 0
+#endif
+int protect_hfs = PROTECT_HFS_DEFAULT;
+
+#ifndef PROTECT_NTFS_DEFAULT
+#define PROTECT_NTFS_DEFAULT 0
+#endif
+int protect_ntfs = PROTECT_NTFS_DEFAULT;
+
/*
* The character that begins a commented line in user-editable file
* that is subject to stripspace.