Git 2.6.1

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

diff --git a/Documentation/RelNotes/2.6.1.txt b/Documentation/RelNotes/2.6.1.txt
new file mode 100644 (file)
index 0000000..1e51363
--- /dev/null
+++ b/Documentation/RelNotes/2.6.1.txt
@@ -0,0 +1,18 @@
+Git v2.6.1 Release Notes
+========================
+
+Fixes since v2.6
+----------------
+
+ * xdiff code we use to generate diffs is not prepared to handle
+   extremely large files.  It uses "int" in many places, which can
+   overflow if we have a very large number of lines or even bytes in
+   our input files, for example.  Cap the input size to soemwhere
+   around 1GB for now.
+
+ * Some protocols (like git-remote-ext) can execute arbitrary code
+   found in the URL.  The URLs that submodules use may come from
+   arbitrary sources (e.g., .gitmodules files in a remote
+   repository), and can hurt those who blindly enable recursive
+   fetch.  Restrict the allowed protocols to well known and safe
+   ones.

diff --git a/Documentation/git.txt b/Documentation/git.txt
index f9a7fb94c5becf0da161ed4167bfbd145c1af8b9..1a426311175941f66efa1865f3a03c63956060fe 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.6.0/git.html[documentation for release 2.6]
+* link:v2.6.1/git.html[documentation for release 2.6.1]
 
 * release notes for
+  link:RelNotes/2.6.1.txt[2.6.1],
   link:RelNotes/2.6.0.txt[2.6].
 
 * link:v2.5.4/git.html[documentation for release 2.5.4]

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 97f58d1dbb5fa4b0b921061371befe9822116941..e1aba8533f5b6d63ac01fb06961843a8f32f75e9 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v2.6.0
+DEF_VER=v2.6.1
 
 LF='
 '

diff --git a/RelNotes b/RelNotes
index 84a20c84c648cacea6b2cbdab43d36e92aaaa5c8..def6ebd43038cd537c2e34617d479d48cc40361c 120000 (symlink)
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes/2.6.0.txt
\ No newline at end of file
+Documentation/RelNotes/2.6.1.txt
\ No newline at end of file