summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-09-28 22:26:49 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-09-28 22:34:28 (GMT)
commit24358560c3c0ab51c9ef8178d99f46711716f6c0 (patch)
tree6086fdca9d31a0ea384730a7453047f15c589cd9
parent11a458befcd7662fbe6d2d53c76d49ae2b0fe219 (diff)
downloadgit-24358560c3c0ab51c9ef8178d99f46711716f6c0.zip
git-24358560c3c0ab51c9ef8178d99f46711716f6c0.tar.gz
git-24358560c3c0ab51c9ef8178d99f46711716f6c0.tar.bz2
Git 2.5.4v2.5.4
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/RelNotes/2.5.4.txt18
-rw-r--r--Documentation/git.txt3
-rwxr-xr-xGIT-VERSION-GEN2
l---------RelNotes2
4 files changed, 22 insertions, 3 deletions
diff --git a/Documentation/RelNotes/2.5.4.txt b/Documentation/RelNotes/2.5.4.txt
new file mode 100644
index 0000000..a5e8477
--- /dev/null
+++ b/Documentation/RelNotes/2.5.4.txt
@@ -0,0 +1,18 @@
+Git v2.5.4 Release Notes
+========================
+
+Fixes since v2.5.4
+------------------
+
+ * 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 b2d8868..1a26275 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.5.3/git.html[documentation for release 2.5.3]
+* link:v2.5.4/git.html[documentation for release 2.5.4]
* release notes for
+ 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],
link:RelNotes/2.5.1.txt[2.5.1],
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 7915077..9987869 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
-DEF_VER=v2.5.3
+DEF_VER=v2.5.4
LF='
'
diff --git a/RelNotes b/RelNotes
index 01910c5..cdb1b48 120000
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes/2.5.3.txt \ No newline at end of file
+Documentation/RelNotes/2.5.4.txt \ No newline at end of file