Git 2.17.4

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

diff --git a/Documentation/RelNotes/2.17.4.txt b/Documentation/RelNotes/2.17.4.txt
new file mode 100644 (file)
index 0000000..7d794ca
--- /dev/null
+++ b/Documentation/RelNotes/2.17.4.txt
@@ -0,0 +1,16 @@
+Git v2.17.4 Release Notes
+=========================
+
+This release is to address the security issue: CVE-2020-5260
+
+Fixes since v2.17.3
+-------------------
+
+ * With a crafted URL that contains a newline in it, the credential
+   helper machinery can be fooled to give credential information for
+   a wrong host.  The attack has been made impossible by forbidding
+   a newline character in any value passed via the credential
+   protocol.
+
+Credit for finding the vulnerability goes to Felix Wilhelm of Google
+Project Zero.

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index bd6cd16e3d917a8759a1c40845ecc24edc8c8a8c..cdb21b3311e73cdbd3d83000fdc369f3b24b4748 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v2.17.3
+DEF_VER=v2.17.4
 
 LF='
 '

diff --git a/RelNotes b/RelNotes
index d14bdb5eda2b6c7ea4a73c7355030c994c53251c..196ab8077e14d09ce66529ee8b2c0372f5650798 120000 (symlink)
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes/2.17.3.txt
\ No newline at end of file
+Documentation/RelNotes/2.17.4.txt
\ No newline at end of file