GIT 1.5.1.2

Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/Documentation/RelNotes-1.5.1.2.txt b/Documentation/RelNotes-1.5.1.2.txt
index f58268f6be37d0de6dbc4e34de1dd539a7504e84..d88456306c503d9e604ffbb699fb7cadacb2e733 100644 (file)
--- a/Documentation/RelNotes-1.5.1.2.txt
+++ b/Documentation/RelNotes-1.5.1.2.txt
@@ -1,4 +1,4 @@
-GIT v1.5.1.2 Release Notes (draft)
+GIT v1.5.1.2 Release Notes

 ==========================
 
 Fixes since v1.5.1.1
 ==========================
 
 Fixes since v1.5.1.1


@@ -6,6 +6,11 @@ Fixes since v1.5.1.1
 
 * Bugfixes
 
 
 * Bugfixes
 

+  - "git clone" over http from a repository that has lost the
+    loose refs by running "git pack-refs" were broken (a code to
+    deal with this was added to "git fetch" in v1.5.0, but it
+    was missing from "git clone").
+

   - "git diff a/ b/" incorrectly fell in "diff between two
     filesystem objects" codepath, when the user most likely
     wanted to limit the extent of output to two tracked
   - "git diff a/ b/" incorrectly fell in "diff between two
     filesystem objects" codepath, when the user most likely
     wanted to limit the extent of output to two tracked


@@ -24,14 +29,22 @@ Fixes since v1.5.1.1
   - git-blame on a very long working tree path had buffer
     overrun problem.
 
   - git-blame on a very long working tree path had buffer
     overrun problem.
 

+  - git-apply did not like to be fed two patches in a row that created
+    and then modified the same file.
+
+  - git-svn was confused when a non-project was stored directly under
+    trunk/, branches/ and tags/.
+
+  - git-svn wants the Error.pm module that was at least as new
+    as what we ship as part of git; install ours in our private
+    installation location if the one on the system is older.
+
+  - An earlier update to command line integer parameter parser was
+    botched and made 'update-index --cacheinfo' completely useless.
+
+

 * Documentation updates
 
   - Various documentation updates from J. Bruce Fields, Frank
     Lichtenheld, Alex Riesen and others.  Andrew Ruder started a
     war on undocumented options.
 * Documentation updates
 
   - Various documentation updates from J. Bruce Fields, Frank
     Lichtenheld, Alex Riesen and others.  Andrew Ruder started a
     war on undocumented options.

-
----
-exec >/var/tmp/1
-O=v1.5.1.1-31-g0220f1e
-echo O=`git describe refs/heads/maint`
-git shortlog --no-merges $O..refs/heads/maint

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 2325660ff42bf7f6e1c998723fd72f150c347c7d..41ee8b4ea2af9e25f7ac2ad56c083108080de49e 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.5.1.1.GIT
+DEF_VER=v1.5.1.2.GIT

 
 LF='
 '
 
 LF='
 '