From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 17 Dec 2014 19:20:31 +0000 (-0800)
Subject: Sync with v1.8.5.6
X-Git-Tag: v2.2.1~1^2~1^2~1^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6898b797218ca1f25818d813318b387d965dc1bb;p=thirdparty%2Fgit.git

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
---

6898b797218ca1f25818d813318b387d965dc1bb
diff --cc Documentation/git.txt
index 3d54378f27,2ff62c54ee..7297fe1ea2
--- a/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.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.5/git.html[documentation for release 1.8.5.5]
+ * 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 ebe9a405d8,29ed24b802..017c487609
--- a/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 read-cache.c
index 4b4effd64b,4fa208b662..ee07cd610a
--- a/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 */