From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 31 May 2024 00:00:57 +0000 (-0700)
Subject: Merge branch 'fixes/2.45.1/2.42' into maint-2.42
X-Git-Tag: v2.42.3~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=18df122d3da765f104d451f95d9195d333f60671;p=thirdparty%2Fgit.git

Merge branch 'fixes/2.45.1/2.42' into maint-2.42

* 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
---

18df122d3da765f104d451f95d9195d333f60671