]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'fixes/2.45.1/2.44' into jc/fix-2.45.1-and-friends-for-maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 24 May 2024 23:59:12 +0000 (16:59 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 24 May 2024 23:59:12 +0000 (16:59 -0700)
* 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

1  2 
.github/workflows/main.yml
builtin/clone.c
config.c
fsck.c
t/t5601-clone.sh

index 3428773b096e9ea0da0488b9d75171f09b7ca961,9016c5acad5b24729f95fc6df5513fc290633932..8922bd73bd9c27920afd9d1c549be377581670ab
@@@ -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
diff --cc builtin/clone.c
Simple merge
diff --cc config.c
Simple merge
diff --cc fsck.c
Simple merge
Simple merge