Sync with v1.8.5.6

* maint-1.8.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 3d54378f275958b443a59023d965450542737dfd,2ff62c54eece2e503b7c411d848cf652742093ba..7297fe1ea25af9504b228e88ff450d2daa20a0e9
--- 1/Documentation/git.txt
--- 2/Documentation/git.txt
+++ b/Documentation/git.txt
@@@ -43,18 -43,10 +43,19 @@@ unreleased) version of Git, that is ava
  branch of the `git.git` repository.
  Documentation for older releases are available here:
  
- * link:v1.8.5.5/git.html[documentation for release 1.8.5.5]
 +* link:v1.9.4/git.html[documentation for release 1.9.4]
 +
 +* release notes for
 +  link:RelNotes/1.9.4.txt[1.9.4],
 +  link:RelNotes/1.9.3.txt[1.9.3],
 +  link:RelNotes/1.9.2.txt[1.9.2],
 +  link:RelNotes/1.9.1.txt[1.9.1],
 +  link:RelNotes/1.9.0.txt[1.9.0].
 +
+ * link:v1.8.5.6/git.html[documentation for release 1.8.5.6]
  
  * release notes for
+   link:RelNotes/1.8.5.6.txt[1.8.5.6],
    link:RelNotes/1.8.5.5.txt[1.8.5.5],
    link:RelNotes/1.8.5.4.txt[1.8.5.4],
    link:RelNotes/1.8.5.3.txt[1.8.5.3],

diff --cc cache.h
index ebe9a405d811b2cc6b64109db135bb8ca4096e9e,29ed24b80273912d022908abba0ba70ad77cd30c..017c487609eab63d4db54b14591455880d01ebaa
--- 1/cache.h
--- 2/cache.h
+++ b/cache.h
@@@ -782,9 -760,10 +784,10 @@@ int longest_ancestor_length(const char 
  char *strip_path_suffix(const char *path, const char *suffix);
  int daemon_avoid_alias(const char *path);
  int offset_1st_component(const char *path);
+ extern int is_ntfs_dotgit(const char *name);
  
  /* object replacement */
 -#define READ_SHA1_FILE_REPLACE 1
 +#define LOOKUP_REPLACE_OBJECT 1
  extern void *read_sha1_file_extended(const unsigned char *sha1, enum object_type *type, unsigned long *size, unsigned flag);
  static inline void *read_sha1_file(const unsigned char *sha1, enum object_type *type, unsigned long *size)
  {

diff --cc config.c
Simple merge

diff --cc config.mak.uname
Simple merge

diff --cc environment.c
Simple merge

diff --cc fsck.c
Simple merge

diff --cc path.c
Simple merge

diff --cc read-cache.c
index 4b4effd64b842173d6a06656935436515c755242,4fa208b662e0dfd888c8bfa94addaee71244f4f0..ee07cd610ae5efebb0ad2bd233ab380a6d605f83
--- 1/read-cache.c
--- 2/read-cache.c
+++ b/read-cache.c
@@@ -14,9 -14,9 +14,10 @@@
  #include "resolve-undo.h"
  #include "strbuf.h"
  #include "varint.h"
+ #include "utf8.h"
  
 -static struct cache_entry *refresh_cache_entry(struct cache_entry *ce, int really);
 +static struct cache_entry *refresh_cache_entry(struct cache_entry *ce,
 +                                             unsigned int options);
  
  /* Mask for the name length in ce_flags in the on-disk index */
  

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

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

diff --cc unpack-trees.c
Simple merge

diff --cc utf8.c
Simple merge