summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Documentation/RelNotes/2.40.4.txt5
-rwxr-xr-xGIT-VERSION-GEN2
l---------RelNotes2
3 files changed, 7 insertions, 2 deletions
diff --git a/Documentation/RelNotes/2.40.4.txt b/Documentation/RelNotes/2.40.4.txt
new file mode 100644
index 0000000000..0ff29f3cfc
--- /dev/null
+++ b/Documentation/RelNotes/2.40.4.txt
@@ -0,0 +1,5 @@
+Git v2.40.4 Release Notes
+=========================
+
+This release lets Git refuse to accept URLs that contain control
+sequences. This addresses CVE-2024-50349 and CVE-2024-52006.
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index b345e89cbe..4f4d294651 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
-DEF_VER=v2.40.3
+DEF_VER=v2.40.4
LF='
'
diff --git a/RelNotes b/RelNotes
index afb47e28e0..b401038a56 120000
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes/2.40.3.txt \ No newline at end of file
+Documentation/RelNotes/2.40.4.txt \ No newline at end of file