diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-09-28 19:19:27 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-09-28 19:19:34 -0700 |
| commit | 22f698cb188243b313e024d618283e0293e37140 (patch) | |
| tree | 469985f79455940a7dd7670e632ff18e1a86cce1 | |
| parent | Sync with v2.5.4 (diff) | |
| download | tgif-22f698cb188243b313e024d618283e0293e37140.tar.xz | |
Git 2.6.1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/RelNotes/2.6.1.txt | 18 | ||||
| -rw-r--r-- | Documentation/git.txt | 3 | ||||
| -rwxr-xr-x | GIT-VERSION-GEN | 2 | ||||
| l--------- | RelNotes | 2 |
4 files changed, 22 insertions, 3 deletions
diff --git a/Documentation/RelNotes/2.6.1.txt b/Documentation/RelNotes/2.6.1.txt new file mode 100644 index 0000000000..1e51363e3c --- /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 f9a7fb94c5..1a42631117 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.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 97f58d1dbb..e1aba8533f 100755 --- 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=' ' @@ -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 |