From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Tue, 29 Oct 2024 23:39:06 +0000 (+0100)
Subject: Git 2.42.4
X-Git-Tag: v2.42.4^0
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=54ddf17f827969c989576f2411d9ff519fa8091f;p=thirdparty%2Fgit.git

Git 2.42.4

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---

diff --git a/Documentation/RelNotes/2.42.4.txt b/Documentation/RelNotes/2.42.4.txt
new file mode 100644
index 0000000000..3129d76e75
--- /dev/null
+++ b/Documentation/RelNotes/2.42.4.txt
@@ -0,0 +1,6 @@
+Git v2.42.4 Release Notes
+=========================
+
+This release merges up the fix that appears in v2.40.4 and v2.41.3
+to address the security issues CVE-2024-50349 and CVE-2024-52006;
+see the release notes for these versions for details.
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 070d22c6d1..69948fce1b 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v2.42.3
+DEF_VER=v2.42.4
 
 LF='
 '
diff --git a/RelNotes b/RelNotes
index 7af3372ac2..e0d3afd77a 120000
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes/2.42.3.txt
\ No newline at end of file
+Documentation/RelNotes/2.42.4.txt
\ No newline at end of file