From: Junio C Hamano <redacted>
Date: Thu, 18 Dec 2014 20:30:53 +0000 (-0800)
Subject: Sync with v2.2.1
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=3f1509809e728b70ea7912e4e1b40f22965e45ee;p=git.git

Sync with v2.2.1

* maint:
  Git 2.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
---

3f1509809e728b70ea7912e4e1b40f22965e45ee