Merge branch 'dotgit-case-maint-1.8.5' into maint-1.8.5
authorJunio C Hamano <gitster@pobox.com>
Wed, 17 Dec 2014 19:11:15 +0000 (11:11 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 17 Dec 2014 19:11:15 +0000 (11:11 -0800)
* 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

1  2 
unpack-trees.c
diff --cc unpack-trees.c
Simple merge