diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-12-17 11:28:02 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-12-17 11:28:54 -0800 |
| commit | 5e519fb8b09378342e23bd8c075cfb4b8e7b0e4f (patch) | |
| tree | 54e850e494e9bb6d25d99f82aeb03e1f8ec3faff /environment.c | |
| parent | 76f8611a5fb7e81c1bada0fb190d573a66fc03f6 (diff) | |
| parent | 83332636f575f00edff8f3afb15a2f96885bf417 (diff) | |
| download | git-5e519fb8b09378342e23bd8c075cfb4b8e7b0e4f.tar.gz git-5e519fb8b09378342e23bd8c075cfb4b8e7b0e4f.tar.xz | |
Sync with v1.9.5
* maint-1.9:
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 5c4815dbe..9daa0ba4a 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. |