diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-12-17 11:20:31 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-12-17 11:20:31 -0800 |
| commit | 6898b797218ca1f25818d813318b387d965dc1bb (patch) | |
| tree | eb41620da7ea49019cb97161646318f54225d647 /cache.h | |
| parent | 9181365b856a63f8c5486ad0fe48f1cd60852da3 (diff) | |
| parent | 5c8213a7696b3d9e29feda2516e350d03d7bd9a4 (diff) | |
| download | git-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 'cache.h')
| -rw-r--r-- | cache.h | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -587,6 +587,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 @@ -782,6 +784,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 LOOKUP_REPLACE_OBJECT 1 |