Git 1.8.5.2

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

diff --git a/Documentation/RelNotes/1.8.5.2.txt b/Documentation/RelNotes/1.8.5.2.txt
new file mode 100644 (file)
index 0000000..3ac4984
--- /dev/null
+++ 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
index 4448ce2704284bde15a8a3222545993035e56467..cc0e5e2bfe66a0962283fd570c5e440e72b57813 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.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
 
 * 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].
 
   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
index 6dd0ec1270050b61c04434e58a8d6596fb3cc07d..0ec4d003fa44f3b34613daa9c558466222c8a8e4 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.5.1
+DEF_VER=v1.8.5.2

 
 LF='
 '
 
 LF='
 '

diff --git a/RelNotes b/RelNotes
index 0064299c0e0cbe3e133d4464f2ab65d89324a0ab..1efc120fe0bdb1a207a1e93ba97c0a082fd32d78 120000 (symlink)
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes/1.8.5.1.txt
\ No newline at end of file
+Documentation/RelNotes/1.8.5.2.txt
\ No newline at end of file