Git 1.8.5.2

Signed-off-by: Junio C Hamano <gitster@pobox.com>
msysgit · Dec 17, 2013 · 5512ac5 · 5512ac5
1 parent 59f3e3f
commit 5512ac5
Showing 4 changed files with 24 additions and 3 deletions.
diff --git a/Documentation/RelNotes/1.8.5.2.txt b/Documentation/RelNotes/1.8.5.2.txt
@@ -0,0 +1,20 @@
+Git v1.8.5.2 Release Notes
+==========================
+
+Fixes since v1.8.5.1
+--------------------
+
+ * "git diff -- ':(icase)makefile'" was unnecessarily rejected at the
+   command line parser.
+
+ * "git cat-file --batch-check=ok" did not check the existence of
+   the named object.
+
+ * "git am --abort" sometimes complained about not being able to write
+   a tree with an 0{40} object in it.
+
+ * Two processes creating loose objects at the same time could have
+   failed unnecessarily when the name of their new objects started
+   with the same byte value, due to a race condition.
+
+Also contains typofixes, documentation updates and trivial code clean-ups.
diff --git 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:
 
-* link:v1.8.5.1/git.html[documentation for release 1.8.5.1]
+* link:v1.8.5.2/git.html[documentation for release 1.8.5.2]
 
 * release notes for
+  link:RelNotes/1.8.5.2.txt[1.8.5.2],
   link:RelNotes/1.8.5.1.txt[1.8.5.1],
   link:RelNotes/1.8.5.txt[1.8.5].
 

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v1.8.5.1
+DEF_VER=v1.8.5.2
 
 LF='
 '

diff --git a/RelNotes b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes/1.8.5.1.txt
+Documentation/RelNotes/1.8.5.2.txt
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		Documentation/RelNotes/1.8.5.1.txt
		Documentation/RelNotes/1.8.5.2.txt