diff options
author | Junio C Hamano <gitster@pobox.com> | 2014-12-17 11:11:15 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-12-17 11:11:15 -0800 |
commit | 2aa910084681a6cbfb0928b2d9c4d0f9ce54e1b8 (patch) | |
tree | 1aeb9ab0f337c278560d7ea72deb21f9c5e45de7 /environment.c | |
parent | git-tag.txt: Add a missing hyphen to `-s` (diff) | |
parent | fsck: complain about NTFS ".git" aliases in trees (diff) | |
download | tgif-2aa910084681a6cbfb0928b2d9c4d0f9ce54e1b8.tar.xz |
Merge branch 'dotgit-case-maint-1.8.5' into maint-1.8.5
* dotgit-case-maint-1.8.5:
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 0a15349cfe..184748da3e 100644 --- a/environment.c +++ b/environment.c @@ -63,6 +63,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. |