diff options
author | Junio C Hamano <gitster@pobox.com> | 2014-12-17 22:46:57 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-12-17 22:46:57 +0300 |
commit | 77933f4449b8d6aa7529d627f3c7b55336f491db (patch) | |
tree | 91ce62aba00c10c6f2f4346f404f64dec00b5c3a /environment.c | |
parent | 8213d87a83867809f490e8d683ebbaa857547189 (diff) | |
parent | 8e36a6d5752ced382ecd46a5f2cd94276f79451c (diff) |
Sync with v2.1.4
* maint-2.1:
Git 2.1.4
Git 2.0.5
Git 1.9.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.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/environment.c b/environment.c index 565f65293b..1ade5c9684 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. |