Git 2.12.5v2.12.5maint-2.12

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

3 files changed, 19 insertions, 2 deletions

diff --git a/Documentation/RelNotes/2.12.5.txt b/Documentation/RelNotes/2.12.5.txt
new file mode 100644
index 0000000000..8fa73cfce7
--- /dev/null
+++ b/Documentation/RelNotes/2.12.5.txt
@@ -0,0 +1,17 @@
+Git v2.12.5 Release Notes
+=========================
+
+Fixes since v2.12.4
+-------------------
+
+ * "git cvsserver" no longer is invoked by "git daemon" by default,
+   as it is old and largely unmaintained.
+
+ * Various Perl scripts did not use safe_pipe_capture() instead of
+   backticks, leaving them susceptible to end-user input.  They have
+   been corrected.
+
+Credits go to joernchen <joernchen@phenoelit.de> for finding the
+unsafe constructs in "git cvsserver", and to Jeff King at GitHub for
+finding and fixing instances of the same issue in other scripts.
+
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index b0e458e5fe..5a6193ad97 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v2.12.4
+DEF_VER=v2.12.5
 
 LF='
 '
diff --git a/RelNotes b/RelNotes
index 478bd29b26..6b0160b6f7 120000
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes/2.12.4.txt
\ No newline at end of file
+Documentation/RelNotes/2.12.5.txt
\ No newline at end of file