summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-05-05 13:33:22 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-05-05 13:33:22 +0900
commit95d67879735cfecfdd85f89e59d993c5b4de8835 (patch)
tree0dd6aaca37286c8b8a36edf5cb3674a0deccde6e
parentMerge branch 'maint-2.11' into maint (diff)
downloadtgif-95d67879735cfecfdd85f89e59d993c5b4de8835.tar.xz
Git 2.12.3
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/RelNotes/2.12.3.txt7
-rw-r--r--Documentation/git.txt7
-rwxr-xr-xGIT-VERSION-GEN2
3 files changed, 12 insertions, 4 deletions
diff --git a/Documentation/RelNotes/2.12.3.txt b/Documentation/RelNotes/2.12.3.txt
index 73ce7daa5c..ebca846d5d 100644
--- a/Documentation/RelNotes/2.12.3.txt
+++ b/Documentation/RelNotes/2.12.3.txt
@@ -54,4 +54,11 @@ Fixes since v2.12.2
turn revealed incorrect expectations the tests make. These tests
have been updated.
+ * "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").
+
Also contains various documentation updates and code clean-ups.
diff --git a/Documentation/git.txt b/Documentation/git.txt
index f40d6c4b19..a52b155b4b 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -44,11 +44,12 @@ 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.12.2/git.html[documentation for release 2.12.2]
+* link:v2.12.3/git.html[documentation for release 2.12.3]
* release notes for
- link:RelNotes/2.12.2.txt[2.12.2].
- link:RelNotes/2.12.1.txt[2.12.1].
+ link:RelNotes/2.12.3.txt[2.12.3],
+ link:RelNotes/2.12.2.txt[2.12.2],
+ link:RelNotes/2.12.1.txt[2.12.1],
link:RelNotes/2.12.0.txt[2.12].
* link:v2.11.1/git.html[documentation for release 2.11.1]
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index e83f591a7b..6cf4ab6f4a 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
-DEF_VER=v2.12.2
+DEF_VER=v2.12.3
LF='
'