Git 2.5.6

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

diff --git a/Documentation/RelNotes/2.5.6.txt b/Documentation/RelNotes/2.5.6.txt
new file mode 100644 (file)
index 0000000..9cd025b
--- /dev/null
+++ b/Documentation/RelNotes/2.5.6.txt
@@ -0,0 +1,12 @@
+Git v2.5.6 Release Notes
+========================
+
+Fixes since v2.5.5
+------------------
+
+ * "git-shell" rejects a request to serve a repository whose name
+   begins with a dash, which makes it no longer possible to get it
+   confused into spawning service programs like "git-upload-pack" with
+   an option like "--help", which in turn would spawn an interactive
+   pager, instead of working with the repository user asked to access
+   (i.e. the one whose name is "--help").

diff --git a/Documentation/git.txt b/Documentation/git.txt
index c64ffa81d8b1c184b99ff5063624f62d021c6403..55c314dbfb2e90c19841b1e465dc1768d6390a93 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.5/git.html[documentation for release 2.5.5]
+* link:v2.5.6/git.html[documentation for release 2.5.6]
 
 * release notes for
+  link:RelNotes/2.5.6.txt[2.5.6],
   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],

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

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