Git 2.4.12

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

diff --git a/Documentation/RelNotes/2.4.12.txt b/Documentation/RelNotes/2.4.12.txt
new file mode 100644 (file)
index 0000000..7d15f94
--- /dev/null
+++ b/Documentation/RelNotes/2.4.12.txt
@@ -0,0 +1,12 @@
+Git v2.4.12 Release Notes
+=========================
+
+Fixes since v2.4.11
+-------------------
+
+ * "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 889fa51f909bf369c5d37eb2c8d3ad5c56fa31d8..7f3941eee79716787db4c88406f79e2158cc4eed 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.4.11/git.html[documentation for release 2.4.11]
+* link:v2.4.12/git.html[documentation for release 2.4.12]
 
 * release notes for
+  link:RelNotes/2.4.12.txt[2.4.12],
   link:RelNotes/2.4.11.txt[2.4.11],
   link:RelNotes/2.4.10.txt[2.4.10],
   link:RelNotes/2.4.9.txt[2.4.9],

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 4b0af4d5be8c10e7c6c9fcb77d5ec94a48ca45f7..cc57af9d00ad239df7f0ab3b20e5189f35aebd43 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v2.4.11
+DEF_VER=v2.4.12
 
 LF='
 '

diff --git a/RelNotes b/RelNotes
index be2419cafe2e3a030552c93c54e20e4903e50e76..03c9d6c287a7fcc1a7050bd398915b5d3b08bff5 120000 (symlink)
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes/2.4.11.txt
\ No newline at end of file
+Documentation/RelNotes/2.4.12.txt
\ No newline at end of file