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 /fsck.c | |
| parent | 76f8611a5fb7e81c1bada0fb190d573a66fc03f6 (diff) | |
| parent | 83332636f575f00edff8f3afb15a2f96885bf417 (diff) | |
| download | git-5e519fb8b09378342e23bd8c075cfb4b8e7b0e4f.tar.gz | |
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 'fsck.c')
| -rw-r--r-- | fsck.c | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -6,6 +6,7 @@ #include "commit.h" #include "tag.h" #include "fsck.h" +#include "utf8.h" static int fsck_walk_tree(struct tree *tree, fsck_walk_func walk, void *data) { @@ -170,7 +171,9 @@ static int fsck_tree(struct tree *item, int strict, fsck_error error_func) has_empty_name |= !*name; has_dot |= !strcmp(name, "."); has_dotdot |= !strcmp(name, ".."); - has_dotgit |= !strcmp(name, ".git"); + has_dotgit |= (!strcmp(name, ".git") || + is_hfs_dotgit(name) || + is_ntfs_dotgit(name)); has_zero_pad |= *(char *)desc.buffer == '0'; update_tree_entry(&desc); |