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

diff --cc Documentation/config.txt
Simple merge

diff --cc Documentation/git.txt
index afb48d39bbd229bb0a28d2e7e2fb835e63248525,78cc101b03ab3d6b0efcc6ed863e4407b499d1a2..4360a795440b598ed17de3bbcb26b00c18d61654
--- 1/Documentation/git.txt
--- 2/Documentation/git.txt
+++ b/Documentation/git.txt
@@@ -43,14 -43,10 +43,15 @@@ unreleased) version of Git, that is ava
  branch of the `git.git` repository.
  Documentation for older releases are available here:
  
- * link:v2.1.3/git.html[documentation for release 2.1.3]
 +* link:v2.2.0/git.html[documentation for release 2.2]
 +
 +* release notes for
 +  link:RelNotes/2.2.0.txt[2.2].
 +
+ * link:v2.1.4/git.html[documentation for release 2.1.4]
  
  * release notes for
+   link:RelNotes/2.1.4.txt[2.1.4],
    link:RelNotes/2.1.3.txt[2.1.3],
    link:RelNotes/2.1.2.txt[2.1.2],
    link:RelNotes/2.1.1.txt[2.1.1],

diff --cc cache.h
Simple merge

diff --cc config.c
Simple merge

diff --cc config.mak.uname
Simple merge

diff --cc fsck.c
index 2fffa434a5763abb6d7895ee8c7582307766ee62,50c6507d60734a95beea11de1b7b7d5e5965e2e6..032419463126234fa855b934bae85fb27d6b26a4
--- 1/fsck.c
--- 2/fsck.c
+++ b/fsck.c
@@@ -6,7 -6,7 +6,8 @@@
  #include "commit.h"
  #include "tag.h"
  #include "fsck.h"
 +#include "refs.h"
+ #include "utf8.h"
  
  static int fsck_walk_tree(struct tree *tree, fsck_walk_func walk, void *data)
  {

diff --cc path.c
Simple merge

diff --cc read-cache.c
Simple merge

diff --cc t/t1450-fsck.sh
Simple merge

diff --cc t/test-lib.sh
Simple merge

diff --cc utf8.c
Simple merge