From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 17 Dec 2014 19:46:57 +0000 (-0800)
Subject: Sync with v2.1.4
X-Git-Tag: v2.2.1~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=77933f4449b8d6aa7529d627f3c7b55336f491db;p=git

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

77933f4449b8d6aa7529d627f3c7b55336f491db
diff --cc Documentation/git.txt
index afb48d39bb,78cc101b03..4360a79544
--- a/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.2.0/git.html[documentation for release 2.2]
 +
 +* release notes for
 +  link:RelNotes/2.2.0.txt[2.2].
 +
- * link:v2.1.3/git.html[documentation for release 2.1.3]
+ * 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 fsck.c
index 2fffa434a5,50c6507d60..0324194631
--- a/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)
  {