summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-05-05 13:29:43 +0900
committerJunio C Hamano <gitster@pobox.com>2017-05-05 13:29:43 +0900
commit773e3a2e0226cffac6c813c2d3bea5ba480675d8 (patch)
treef09194ecd6fb9982ded057dedcab00a45641ab3b
parenta849d36cf2877a1890371851710382f463290978 (diff)
downloadgit-773e3a2e0226cffac6c813c2d3bea5ba480675d8.tar.gz
Git 2.11.2v2.11.2
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/RelNotes/2.11.2.txt12
-rw-r--r--Documentation/git.txt3
-rwxr-xr-xGIT-VERSION-GEN2
l---------RelNotes2
4 files changed, 16 insertions, 3 deletions
diff --git a/Documentation/RelNotes/2.11.2.txt b/Documentation/RelNotes/2.11.2.txt
new file mode 100644
index 0000000000..7428851168
--- /dev/null
+++ b/Documentation/RelNotes/2.11.2.txt
@@ -0,0 +1,12 @@
+Git v2.11.2 Release Notes
+=========================
+
+Fixes since v2.11.1
+-------------------
+
+ * "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 2a663e5b57..cc215361f1 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -44,9 +44,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.11.1/git.html[documentation for release 2.11.1]
+* link:v2.11.2/git.html[documentation for release 2.11.2]
* release notes for
+ link:RelNotes/2.11.2.txt[2.11.2],
link:RelNotes/2.11.1.txt[2.11.1],
link:RelNotes/2.11.0.txt[2.11].
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 706946c7cd..d207f15fb0 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
-DEF_VER=v2.11.1
+DEF_VER=v2.11.2
LF='
'
diff --git a/RelNotes b/RelNotes
index 7f250ddc2e..9f01cfb579 120000
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes/2.11.1.txt \ No newline at end of file
+Documentation/RelNotes/2.11.2.txt \ No newline at end of file