]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'fixes/2.45.1/2.42' into fixes/2.45.1/2.43
authorJunio C Hamano <gitster@pobox.com>
Fri, 24 May 2024 23:58:11 +0000 (16:58 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 24 May 2024 23:58:11 +0000 (16:58 -0700)
* 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

1  2 
Documentation/fsck-msgids.txt
builtin/clone.c
config.c
fsck.c
fsck.h
t/t1450-fsck.sh
t/t5601-clone.sh

Simple merge
diff --cc builtin/clone.c
Simple merge
diff --cc config.c
Simple merge
diff --cc fsck.c
Simple merge
diff --cc fsck.h
index 17fa2dda5dee3de5553da16fc9f9d337087701ea,6359ba359bd24a5ece2fa4752d55f703af32388e..e3adf9d91159878ae09b35a9fe12370fdbf85f98
--- 1/fsck.h
--- 2/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(SYMLINK_TARGET_LENGTH, WARN) \
-       FUNC(SYMLINK_POINTS_TO_GIT_DIR, WARN) \
 +      FUNC(LARGE_PATHNAME, WARN) \
        /* infos (reported as warnings, but ignored by default) */ \
        FUNC(BAD_FILEMODE, INFO) \
        FUNC(GITMODULES_PARSE, INFO) \
diff --cc t/t1450-fsck.sh
Simple merge
Simple merge