summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-03-17 10:56:06 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-03-17 11:26:41 -0700
commite46579643d56162299b1756b70d418005351b256 (patch)
tree49da5ee0b8720899fcda441a7c9459474764f9d4
parentMerge branch 'maint-2.5' into maint-2.6 (diff)
downloadtgif-e46579643d56162299b1756b70d418005351b256.tar.xz
Git 2.6.6
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/RelNotes/2.6.6.txt11
-rw-r--r--Documentation/git.txt3
-rwxr-xr-xGIT-VERSION-GEN2
l---------RelNotes2
4 files changed, 15 insertions, 3 deletions
diff --git a/Documentation/RelNotes/2.6.6.txt b/Documentation/RelNotes/2.6.6.txt
new file mode 100644
index 0000000000..023ad85ec6
--- /dev/null
+++ b/Documentation/RelNotes/2.6.6.txt
@@ -0,0 +1,11 @@
+Git v2.6.6 Release Notes
+========================
+
+Fixes since v2.6.5
+------------------
+
+ * 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 0e397f41ed..ea256de13c 100644
--- 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.6.5/git.html[documentation for release 2.6.5]
+* link:v2.6.6/git.html[documentation for release 2.6.6]
* release notes for
+ link:RelNotes/2.6.6.txt[2.6.6],
link:RelNotes/2.6.5.txt[2.6.5],
link:RelNotes/2.6.4.txt[2.6.4],
link:RelNotes/2.6.3.txt[2.6.3],
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 7ed482057c..d2508fd236 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
-DEF_VER=v2.6.5
+DEF_VER=v2.6.6
LF='
'
diff --git a/RelNotes b/RelNotes
index 4570bdf876..fdbb467941 120000
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes/2.6.5.txt \ No newline at end of file
+Documentation/RelNotes/2.6.6.txt \ No newline at end of file