Merge branch 'fixes/2.45.1/2.41' into fixes/2.45.1/2.42
commit73339e4dc2f00e10b0e86b6a6b275b32e54b1d9c
authorJunio C Hamano <gitster@pobox.com>
Fri, 24 May 2024 23:57:43 +0000 (24 16:57 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 24 May 2024 23:57:43 +0000 (24 16:57 -0700)
tree9f203af00adb57f7ab328c902aa35d861a314bd5
parentbabb4e5d7107ba730beff8d224e4bcf065533e0b
parent4f215d214f15b1dbecd9816aea740b0df37b3fa5
Merge branch 'fixes/2.45.1/2.41' into fixes/2.45.1/2.42

* fixes/2.45.1/2.41:
  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
.github/workflows/main.yml
builtin/clone.c
config.c
copy.c
fsck.c
fsck.h
hook.c
t/helper/test-path-utils.c
t/t1450-fsck.sh
t/t1800-hook.sh