Git 2.17.2

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

diff --git a/Documentation/RelNotes/2.17.2.txt b/Documentation/RelNotes/2.17.2.txt
new file mode 100644 (file)
index 0000000..ef021be
--- /dev/null
+++ b/Documentation/RelNotes/2.17.2.txt
@@ -0,0 +1,12 @@
+Git v2.17.2 Release Notes
+=========================
+
+This release merges up the fixes that appear in v2.14.5 to address
+the recently reported CVE-2018-17456; see the release notes for that
+version for details.
+
+In addition, this release also teaches "fsck" and the server side
+logic to reject pushes to repositories that attempt to create such a
+problematic ".gitmodules" file as tracked contents, to help hosting
+sites protect their customers by preventing malicious contents from
+spreading.

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

diff --git a/RelNotes b/RelNotes
index cde891dc0c46198ef89353ac227d916249382bb9..733d1745a9a04075ba8e0e8fcea16457a7077689 120000 (symlink)
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes/2.17.1.txt
\ No newline at end of file
+Documentation/RelNotes/2.17.2.txt
\ No newline at end of file