aboutsummaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-12-17 11:46:57 -0800
committerJunio C Hamano <gitster@pobox.com>2014-12-17 11:46:57 -0800
commit77933f4449b8d6aa7529d627f3c7b55336f491db (patch)
tree91ce62aba00c10c6f2f4346f404f64dec00b5c3a /cache.h
parent8213d87a83867809f490e8d683ebbaa857547189 (diff)
parent8e36a6d5752ced382ecd46a5f2cd94276f79451c (diff)
downloadgit-77933f4449b8d6aa7529d627f3c7b55336f491db.tar.gz
git-77933f4449b8d6aa7529d627f3c7b55336f491db.tar.xz
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 'cache.h')
-rw-r--r--cache.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/cache.h b/cache.h
index 99ed096ae..22b7b8129 100644
--- a/cache.h
+++ b/cache.h
@@ -617,6 +617,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
@@ -831,6 +833,7 @@ int normalize_path_copy(char *dst, const char *src);
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);
+extern int is_ntfs_dotgit(const char *name);
/* object replacement */
#define LOOKUP_REPLACE_OBJECT 1