Git 1.8.1.6

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/RelNotes/1.8.1.6.txt b/Documentation/RelNotes/1.8.1.6.txt
index d9de6390809b476d3ee191b8f77fea450337f18f..c15cf2e80545bbcf1556209bbb078688a544e732 100644 (file)
--- a/Documentation/RelNotes/1.8.1.6.txt
+++ b/Documentation/RelNotes/1.8.1.6.txt
@@ -4,6 +4,11 @@ Git 1.8.1.6 Release Notes
 Fixes since v1.8.1.5
 --------------------
 
 Fixes since v1.8.1.5
 --------------------
 

+ * An earlier change to the attribute system introduced at v1.8.1.2 by
+   mistake stopped a pattern "dir" (without trailing slash) from
+   matching a directory "dir" (it only wanted to allow pattern "dir/"
+   to also match).
+

  * The code to keep track of what directory names are known to Git on
    platforms with case insensitive filesystems can get confused upon a
    hash collision between these pathnames and looped forever.
  * The code to keep track of what directory names are known to Git on
    platforms with case insensitive filesystems can get confused upon a
    hash collision between these pathnames and looped forever.

diff --git a/Documentation/git.txt b/Documentation/git.txt
index 98a45addf54730d86bbca585e854fcc7ae011b79..91299174f1426f7df5fc805ea327b488c90241e6 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -43,9 +43,10 @@ unreleased) version of git, that is available from 'master'
 branch of the `git.git` repository.
 Documentation for older releases are available here:
 
 branch of the `git.git` repository.
 Documentation for older releases are available here:
 

-* link:v1.8.1.5/git.html[documentation for release 1.8.1.5]
+* link:v1.8.1.6/git.html[documentation for release 1.8.1.6]

 
 * release notes for
 
 * release notes for

+  link:RelNotes/1.8.1.6.txt[1.8.1.6],

   link:RelNotes/1.8.1.5.txt[1.8.1.5],
   link:RelNotes/1.8.1.4.txt[1.8.1.4],
   link:RelNotes/1.8.1.3.txt[1.8.1.3],
   link:RelNotes/1.8.1.5.txt[1.8.1.5],
   link:RelNotes/1.8.1.4.txt[1.8.1.4],
   link:RelNotes/1.8.1.3.txt[1.8.1.3],

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 6f09e2ff8bbd1b84e35a65ecf834a6ebea791532..2908204894c33111075ad6b8c4b56bcacec08131 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE

-DEF_VER=v1.8.1.5
+DEF_VER=v1.8.1.6

 
 LF='
 '
 
 LF='
 '