Skip to content

[pull] master from git:master #133

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 3 commits into from
Nov 17, 2025
Merged

[pull] master from git:master #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ffff0bb
Use Perforce arm64 binary on macOS CI jobs
gitster Nov 16, 2025
7f79dc3
Merge branch 'jc/ci-use-arm64-p4-on-macos'
gitster Nov 17, 2025
9a2fb14
Git 2.52
gitster Nov 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions Documentation/RelNotes/2.52.0.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ UI, Workflows & Features
* A new command "git last-modified" has been added to show the closest
ancestor commit that touched each path.

* "git refs exists" that works like "git show-ref --exists" has been
added.
* The "git refs exists" command that works like "git show-ref --exists"
has been added.

* "repo info" learns a short-hand option "-z" that is the same as
* "git repo info" learns the short-hand option "-z" that is the same as
"--format=nul", and learns to report the objects format used in the
repository.

Expand Down Expand Up @@ -433,7 +433,10 @@ including security updates, are included in this release.

* The version of macos image used in GitHub CI has been updated to
macos-14, as the macos-13 that we have been using got deprecated.
Perforce binary used there has been changed to arm64 version to
match.
(merge 73b9cdb7c4 jc/ci-use-macos-14 later to maint).
(merge ffff0bb0da jc/ci-use-arm64-p4-on-macos later to maint).

* Other code cleanup, docfix, build fix, etc.
(merge 529a60a885 ua/t1517-short-help-tests later to maint).
Expand Down
2 changes: 1 addition & 1 deletion GIT-VERSION-GEN
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/sh

DEF_VER=v2.52.0-rc2
DEF_VER=v2.52.0

LF='
'
Expand Down
2 changes: 1 addition & 1 deletion ci/install-dependencies.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ macos-*)
brew link --force gettext

mkdir -p "$CUSTOM_PATH"
wget -q "$P4WHENCE/bin.macosx1015x86_64/helix-core-server.tgz" &&
wget -q "$P4WHENCE/bin.macosx12arm64/helix-core-server.tgz" &&
tar -xf helix-core-server.tgz -C "$CUSTOM_PATH" p4 p4d &&
sudo xattr -d com.apple.quarantine "$CUSTOM_PATH/p4" "$CUSTOM_PATH/p4d" 2>/dev/null || true
rm helix-core-server.tgz
Expand Down