Merge branch 'fixes/2.45.1/2.42' into fixes/2.45.1/2.43
commit3c562ef2e666db76f256e04755983c9037a0c9e5
authorJunio C Hamano <gitster@pobox.com>
Fri, 24 May 2024 23:58:11 +0000 (24 16:58 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 24 May 2024 23:58:11 +0000 (24 16:58 -0700)
tree28719a195aaf49d50dbe45e4e78b7c6bc37d55fb
parent1f2e64e22dee75db96b92d526d14003ba59a154e
parent73339e4dc2f00e10b0e86b6a6b275b32e54b1d9c
Merge branch 'fixes/2.45.1/2.42' into fixes/2.45.1/2.43

* fixes/2.45.1/2.42:
  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
Documentation/fsck-msgids.txt
builtin/clone.c
config.c
fsck.c
fsck.h
t/t1450-fsck.sh
t/t5601-clone.sh