From 5512ac5840c8bcaa487806cf402ff960091ab244 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 17 Dec 2013 11:42:12 -0800 Subject: [PATCH] Git 1.8.5.2 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/1.8.5.2.txt | 20 ++++++++++++++++++++ Documentation/git.txt | 3 ++- GIT-VERSION-GEN | 2 +- RelNotes | 2 +- 4 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 Documentation/RelNotes/1.8.5.2.txt diff --git a/Documentation/RelNotes/1.8.5.2.txt b/Documentation/RelNotes/1.8.5.2.txt new file mode 100644 index 0000000000..3ac4984f10 --- /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 4448ce2704..cc0e5e2bfe 100644 --- 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 index 6dd0ec1270..0ec4d003fa 100755 --- 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 index 0064299c0e..1efc120fe0 120000 --- 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 -- 2.11.4.GIT