Git 2.5.5

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

diff --git a/Documentation/RelNotes/2.5.5.txt b/Documentation/RelNotes/2.5.5.txt
new file mode 100644 (file)
index 0000000..37eae9a
--- /dev/null
+++ b/Documentation/RelNotes/2.5.5.txt
@@ -0,0 +1,11 @@
+Git v2.5.5 Release Notes
+========================
+
+Fixes since v2.5.4
+------------------
+
+ * Bugfix patches were backported from the 'master' front to plug heap
+   corruption holes, to catch integer overflow in the computation of
+   pathname lengths, and to get rid of the name_path API.  Both of
+   these would have resulted in writing over an under-allocated buffer
+   when formulating pathnames while tree traversal.

diff --git a/Documentation/git.txt b/Documentation/git.txt
index 5449d7b35cc2c9212979ce80cf7d0e8015970b15..fe5fefe230a4ecde3b343ba21052e58cdfb0dfd1 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -43,9 +43,10 @@ unreleased) version of Git, that is available from the 'master'
 branch of the `git.git` repository.
 Documentation for older releases are available here:
 
-* link:v2.5.4/git.html[documentation for release 2.5.4]
+* link:v2.5.5/git.html[documentation for release 2.5.5]
 
 * release notes for
+  link:RelNotes/2.5.5.txt[2.5.5],
   link:RelNotes/2.5.4.txt[2.5.4],
   link:RelNotes/2.5.3.txt[2.5.3],
   link:RelNotes/2.5.2.txt[2.5.2],

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 998786939b9b64a5f992d89a5e3c784e2b75d047..51ae63d753b6a27c151413f9221d54dda1f9f7a4 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v2.5.4
+DEF_VER=v2.5.5
 
 LF='
 '

diff --git a/RelNotes b/RelNotes
index cdb1b4853d82672422f455f022015014741ffecd..3f734d99aa122eac5f7d542f563aea9fbb9b626f 120000 (symlink)
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes/2.5.4.txt
\ No newline at end of file
+Documentation/RelNotes/2.5.5.txt
\ No newline at end of file