diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-05-24 16:59:12 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-05-24 16:59:12 -0700 |
| commit | d36cc0d5a4be8d0c91e46080d80df8e17a46df5c (patch) | |
| tree | 9f6e22e4f7709e2c7ad005aa8e44f7b7aa34547f /ci | |
| parent | 2c7b491c1d3107be35c375f59e040b0f13d0cc0c (diff) | |
| parent | 863c0ed71ef2897414d3f5d9681a25ac1c42d107 (diff) | |
| download | git-d36cc0d5a4be8d0c91e46080d80df8e17a46df5c.tar.xz | |
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
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/install-dependencies.sh | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh index b4e22de3cb..fa0c00c606 100755 --- a/ci/install-dependencies.sh +++ b/ci/install-dependencies.sh @@ -34,8 +34,6 @@ macos-*) export HOMEBREW_NO_AUTO_UPDATE=1 HOMEBREW_NO_INSTALL_CLEANUP=1 # Uncomment this if you want to run perf tests: # brew install gnu-time - test -z "$BREW_INSTALL_PACKAGES" || - brew install $BREW_INSTALL_PACKAGES brew link --force gettext mkdir -p "$P4_PATH" |