Merge branch 'jc/fix-2.45.1-and-friends-for-2.39' into fixes/2.45.1/2.40
commit48440f60a730b93b2a39449a69cb56db5e7114c7
authorJunio C Hamano <gitster@pobox.com>
Fri, 24 May 2024 19:29:35 +0000 (24 12:29 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 24 May 2024 19:29:36 +0000 (24 12:29 -0700)
tree6547cae6f0c29cd3a8be08c3abb2e004b8fae3de
parentb9b439e0e3a543ddb920e4cf8d3c9d53f730111f
parent1991703bdbb7839e3b43e0e0238f8efd76c8fe8d
Merge branch 'jc/fix-2.45.1-and-friends-for-2.39' into fixes/2.45.1/2.40

Revert overly aggressive "layered defence" that went into 2.45.1
and friends, which broke "git-lfs", "git-annex", and other use
cases, so that we can rebuild necessary counterparts in the open.

* jc/fix-2.45.1-and-friends-for-2.39:
  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:
.github/workflows/main.yml
Makefile
builtin/clone.c
cache.h
config.c
fsck.c
fsck.h
git-send-email.perl
hook.c
t/t1450-fsck.sh
t/t1800-hook.sh
t/t5601-clone.sh
t/t9001-send-email.sh