From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Fri, 27 May 2022 21:38:36 +0000 (+0200)
Subject: Git 2.30.5
X-Git-Tag: v2.30.5^0
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=88b7be68a4bf9f39b84ed438d8d776c0d752b316;p=thirdparty%2Fgit.git

Git 2.30.5

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

diff --git a/Documentation/RelNotes/2.30.5.txt b/Documentation/RelNotes/2.30.5.txt
new file mode 100644
index 0000000000..5191cab3ae
--- /dev/null
+++ b/Documentation/RelNotes/2.30.5.txt
@@ -0,0 +1,12 @@
+Git v2.30.5 Release Notes
+=========================
+
+This release contains minor fix-ups for the changes that went into
+Git 2.30.3 and 2.30.4, addressing CVE-2022-29187.
+
+ * The safety check that verifies a safe ownership of the Git
+   worktree is now extended to also cover the ownership of the Git
+   directory (and the `.git` file, if there is any).
+
+Carlo Marcelo Arenas Belón (1):
+      setup: tighten ownership checks post CVE-2022-24765
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index a927c77478..39d0c99da6 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v2.30.4
+DEF_VER=v2.30.5
 
 LF='
 '
diff --git a/RelNotes b/RelNotes
index 4dcee84642..406d23844b 120000
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes/2.30.4.txt
\ No newline at end of file
+Documentation/RelNotes/2.30.5.txt
\ No newline at end of file