summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2024-05-31 01:52:52 +0200
committerJunio C Hamano <gitster@pobox.com>2024-05-31 01:52:52 +0200
commitcc7d11c16782041a6bb73e2fb56417b7d4c6d186 (patch)
treee75563d332976e4065afdb3344067d821b92e1eb
parentMerge branch 'jc/fix-2.45.1-and-friends-for-2.39' into maint-2.39 (diff)
downloadgit-cc7d11c16782041a6bb73e2fb56417b7d4c6d186.tar.xz
git-cc7d11c16782041a6bb73e2fb56417b7d4c6d186.zip
Git 2.39.5v2.39.5
-rw-r--r--Documentation/RelNotes/2.39.5.txt26
-rwxr-xr-xGIT-VERSION-GEN2
l---------RelNotes2
3 files changed, 28 insertions, 2 deletions
diff --git a/Documentation/RelNotes/2.39.5.txt b/Documentation/RelNotes/2.39.5.txt
new file mode 100644
index 0000000000..97c0185de4
--- /dev/null
+++ b/Documentation/RelNotes/2.39.5.txt
@@ -0,0 +1,26 @@
+Git v2.39.5 Release Notes
+=========================
+
+In preparing security fixes for four CVEs, we made overly aggressive
+"defense in depth" changes that broke legitimate use cases like 'git
+lfs' and 'git annex.' This release is to revert these misguided, if
+well-intentioned, changes that were shipped in 2.39.4 and were not
+direct security fixes.
+
+Jeff King (5):
+ send-email: drop FakeTerm hack
+ send-email: avoid creating more than one Term::ReadLine object
+ ci: drop mention of BREW_INSTALL_PACKAGES variable
+ ci: avoid bare "gcc" for osx-gcc job
+ ci: stop installing "gcc-13" for osx-gcc
+
+Johannes Schindelin (6):
+ hook: plug a new memory leak
+ init: use the correct path of the templates directory again
+ Revert "core.hooksPath: add some protection while cloning"
+ tests: verify that `clone -c core.hooksPath=/dev/null` works again
+ clone: drop the protections where hooks aren't run
+ Revert "Add a helper function to compare file contents"
+
+Junio C Hamano (1):
+ Revert "fsck: warn about symlink pointing inside a gitdir"
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index c124ef0b41..b58a5e2d30 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
-DEF_VER=v2.39.4
+DEF_VER=v2.39.5
LF='
'
diff --git a/RelNotes b/RelNotes
index 34ee294000..eda51229b8 120000
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes/2.39.4.txt \ No newline at end of file
+Documentation/RelNotes/2.39.5.txt \ No newline at end of file