From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 20 Nov 2024 05:43:30 +0000 (+0900)
Subject: Prepare for 2.47.1
X-Git-Tag: v2.47.1~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f1a384425d5ce07db8f44bf173076620f89a1f4f;p=thirdparty%2Fgit.git

Prepare for 2.47.1

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

diff --git a/Documentation/RelNotes/2.47.1.txt b/Documentation/RelNotes/2.47.1.txt
new file mode 100644
index 0000000000..6d7a4d98fb
--- /dev/null
+++ b/Documentation/RelNotes/2.47.1.txt
@@ -0,0 +1,26 @@
+Git 2.47.1 Release Notes
+========================
+
+This is to flush accumulated fixes since 2.47.0 on the 'master'
+front down to the maintenance track.
+
+
+Fixes since Git 2.47
+--------------------
+
+ * Use after free and double freeing at the end in "git log -L... -p"
+   had been identified and fixed.
+
+ * On macOS, fsmonitor can fall into a race condition that results in
+   a client waiting forever to be notified for an event that have
+   already happened.  This problem has been corrected.
+
+ * "git maintenance start" crashed due to an uninitialized variable
+   reference, which has been corrected.
+
+ * Fail gracefully instead of crashing when attempting to write the
+   contents of a corrupt in-core index as a tree object.
+
+ * A "git fetch" from the superproject going down to a submodule used
+   a wrong remote when the default remote names are set differently
+   between them.
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index b3265f7bec..5fcb9ded7f 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v2.47.0
+DEF_VER=v2.47.1
 
 LF='
 '
diff --git a/RelNotes b/RelNotes
index 0104513a31..768c16d81b 120000
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes/2.47.0.txt
\ No newline at end of file
+Documentation/RelNotes/2.47.1.txt
\ No newline at end of file