Git 2.40.3

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

diff --cc Documentation/RelNotes/2.40.3.txt
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..6ca088ec86b3d349538f2aaa0714514e22fd9bbe
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/Documentation/RelNotes/2.40.3.txt
@@@ -1,0 -1,0 +1,26 @@@
++Git v2.40.3 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.40.2 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 --cc GIT-VERSION-GEN
index fc9c36a511cd74d844eb62c8fa84e1a9614517a5,b58a5e2d3010acfa299a04e678906fae8e01dadc..b345e89cbef0957131f1ef7c2bfd58ea32b2f062
--- 1/GIT-VERSION-GEN
--- 2/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@@ -1,7 -1,7 +1,7 @@@
  #!/bin/sh
  
  GVF=GIT-VERSION-FILE
- DEF_VER=v2.40.2
 -DEF_VER=v2.39.5
++DEF_VER=v2.40.3
  
  LF='
  '

diff --cc RelNotes
index 6d30158d7de8a2914e7c67c0516f4519c9547b59,eda51229b82d045c3087d9e02725969c29dc6f5a..afb47e28e0b1fe89f88f729d8edc20b14082d287
--- 1/RelNotes
--- 2/RelNotes
+++ b/RelNotes
@@@ -1,1 -1,1 +1,1 @@@
- Documentation/RelNotes/2.40.2.txt
 -Documentation/RelNotes/2.39.5.txt
++Documentation/RelNotes/2.40.3.txt