From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 24 May 2024 23:58:11 +0000 (-0700)
Subject: Merge branch 'fixes/2.45.1/2.42' into fixes/2.45.1/2.43
X-Git-Tag: v2.43.5~1^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3c562ef2e666db76f256e04755983c9037a0c9e5;p=thirdparty%2Fgit.git

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

3c562ef2e666db76f256e04755983c9037a0c9e5
diff --cc fsck.h
index 17fa2dda5d,6359ba359b..e3adf9d911
--- a/fsck.h
+++ b/fsck.h
@@@ -75,9 -73,6 +73,7 @@@ enum fsck_msg_type 
  	FUNC(NULL_SHA1, WARN) \
  	FUNC(ZERO_PADDED_FILEMODE, WARN) \
  	FUNC(NUL_IN_COMMIT, WARN) \
 +	FUNC(LARGE_PATHNAME, WARN) \
- 	FUNC(SYMLINK_TARGET_LENGTH, WARN) \
- 	FUNC(SYMLINK_POINTS_TO_GIT_DIR, WARN) \
  	/* infos (reported as warnings, but ignored by default) */ \
  	FUNC(BAD_FILEMODE, INFO) \
  	FUNC(GITMODULES_PARSE, INFO) \