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 /cache.h | |
| parent | eeff891ac756fd97a05476446f15269b714ce4cc (diff) | |
| parent | d08c13b947335cc48ecc1a8453d97b7147c2d6d6 (diff) | |
| download | git-2aa910084681a6cbfb0928b2d9c4d0f9ce54e1b8.tar.gz git-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 'cache.h')
| -rw-r--r-- | cache.h | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -584,6 +584,8 @@ extern int fsync_object_files; extern int core_preload_index; extern int core_apply_sparse_checkout; extern int precomposed_unicode; +extern int protect_hfs; +extern int protect_ntfs; /* * The character that begins a commented line in user-editable file @@ -758,6 +760,7 @@ int longest_ancestor_length(const char *path, struct string_list *prefixes); char *strip_path_suffix(const char *path, const char *suffix); int daemon_avoid_alias(const char *path); int offset_1st_component(const char *path); +extern int is_ntfs_dotgit(const char *name); /* object replacement */ #define READ_SHA1_FILE_REPLACE 1 |