Merge branch 'fixes/2.45.1/2.40' into fixes/2.45.1/2.41
commit4f215d214f15b1dbecd9816aea740b0df37b3fa5
authorJunio C Hamano <gitster@pobox.com>
Fri, 24 May 2024 23:57:01 +0000 (24 16:57 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 24 May 2024 23:57:02 +0000 (24 16:57 -0700)
tree9da0e1a36964e4ee5ccdfd93a16d19ade7d32d85
parent0f158320593bd57fe2c3fe55fbce751e9415ffc2
parent48440f60a730b93b2a39449a69cb56db5e7114c7
Merge branch 'fixes/2.45.1/2.40' into fixes/2.45.1/2.41

* fixes/2.45.1/2.40:
  Revert "fsck: warn about symlink pointing inside a gitdir"
  Revert "Add a helper function to compare file contents"
  clone: drop the protections where hooks aren't run
  tests: verify that `clone -c core.hooksPath=/dev/null` works again
  Revert "core.hooksPath: add some protection while cloning"
  init: use the correct path of the templates directory again
  hook: plug a new memory leak
  ci: stop installing "gcc-13" for osx-gcc
  ci: avoid bare "gcc" for osx-gcc job
  ci: drop mention of BREW_INSTALL_PACKAGES variable
  send-email: avoid creating more than one Term::ReadLine object
  send-email: drop FakeTerm hack
13 files changed:
Makefile
builtin/clone.c
config.c
copy.c
copy.h
fsck.c
fsck.h
git-send-email.perl
hook.c
t/helper/test-path-utils.c
t/t0060-path-utils.sh
t/t1450-fsck.sh
t/t9001-send-email.sh