From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 24 May 2024 23:59:12 +0000 (-0700)
Subject: Merge branch 'fixes/2.45.1/2.44' into jc/fix-2.45.1-and-friends-for-maint
X-Git-Tag: v2.45.2~1^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d36cc0d5a4be8d0c91e46080d80df8e17a46df5c;p=thirdparty%2Fgit.git

Merge branch 'fixes/2.45.1/2.44' into jc/fix-2.45.1-and-friends-for-maint

* fixes/2.45.1/2.44:
  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
---

d36cc0d5a4be8d0c91e46080d80df8e17a46df5c
diff --cc .github/workflows/main.yml
index 3428773b09,9016c5acad..8922bd73bd
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@@ -280,12 -277,8 +280,11 @@@ jobs
            - jobname: osx-clang
              cc: clang
              pool: macos-13
 +          - jobname: osx-reftable
 +            cc: clang
 +            pool: macos-13
            - jobname: osx-gcc
-             cc: gcc
-             cc_package: gcc-13
+             cc: gcc-13
              pool: macos-13
            - jobname: linux-gcc-default
              cc: gcc