Skip to content

git: update to 2.52.0 #30133

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
merged 1 commit into from
Nov 19, 2025
Merged

git: update to 2.52.0 #30133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 10 additions & 10 deletions devel/git/Portfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ legacysupport.newest_darwin_requires_legacy 11
name git
# NOTE: Update the DEVEL version first before updating this RELEASE version,
# to verify that the intended version builds on all platforms.
version 2.51.1
version 2.52.0
revision 0

description A fast version control system
Expand Down Expand Up @@ -61,13 +61,13 @@ if {${name} eq ${subport}} {
git-manpages-${version}${extract.suffix}

checksums git-${version}${extract.suffix} \
rmd160 87a0ace578cdaf934e0e5a27f25a1e5a790035b2 \
sha256 a83fd9ffaed7eee679ed92ceb06f75b4615ebf66d3ac4fbdbfbc9567dc533f4a \
size 7865216 \
rmd160 2cc7283f8e9ee453b658a2c6309f9751f62f1089 \
sha256 3cd8fee86f69a949cb610fee8cd9264e6873d07fa58411f6060b3d62729ed7c5 \
size 7957064 \
git-manpages-${version}${extract.suffix} \
rmd160 3b2a8f34efbfb397fdd84848dcf7020a04f7729e \
sha256 07a3fd7d3f9c305643b60d7899807d9c0474dc96f7d2a73c7887f327c258f22e \
size 602552
rmd160 a0f5aa8c561291735b862c38e50ec2c6d8581678 \
sha256 23186deddb3083bbaa9eb947cde26a5c7322d7fdb75bb4b3d60795db38221ac5 \
size 607864

extract.only git-${version}${extract.suffix} \
git-manpages-${version}${extract.suffix}
Expand Down Expand Up @@ -281,9 +281,9 @@ variant doc description {Install HTML and plaintext documentation} {
# RELEASE
distfiles-append git-htmldocs-${version}${extract.suffix}
checksums-append git-htmldocs-${version}${extract.suffix} \
rmd160 89458fc6b9bc45e92ef0dd16664a1d986eb919eb \
sha256 524122af16a2c816dc6298f0cea1b761a840d76977e74de2bfffcdbdabc9dc0d \
size 1629412
rmd160 02f5cbfbb86b31a2b6dd1034da84816585b6f609 \
sha256 e6efd0da47a15b6a59401c8c5c8944e4315b18a176b89bb57812778d6307be84 \
size 1657524

patchfiles-append patch-git-subtree.html.diff

Expand Down
14 changes: 0 additions & 14 deletions devel/git/files/patch-Revert-breaking-osxkeychain.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,20 +22,6 @@ This reverts commit b201316835bbf2c49c2780f23cfd6146f6b8d1a2.
.../osxkeychain/git-credential-osxkeychain.c | 390 +++---------------
2 files changed, 69 insertions(+), 324 deletions(-)

diff --git a/contrib/credential/osxkeychain/Makefile b/contrib/credential/osxkeychain/Makefile
index 238f5f8c36..4b3a08a2ba 100644
--- a/contrib/credential/osxkeychain/Makefile
+++ b/contrib/credential/osxkeychain/Makefile
@@ -8,8 +8,7 @@ CFLAGS = -g -O2 -Wall
-include ../../../config.mak

git-credential-osxkeychain: git-credential-osxkeychain.o
- $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) \
- -framework Security -framework CoreFoundation
+ $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) -Wl,-framework -Wl,Security

git-credential-osxkeychain.o: git-credential-osxkeychain.c
$(CC) -c $(CFLAGS) $<
diff --git a/contrib/credential/osxkeychain/git-credential-osxkeychain.c b/contrib/credential/osxkeychain/git-credential-osxkeychain.c
index 1c8310d7fe..5f2e5f16c8 100644
--- a/contrib/credential/osxkeychain/git-credential-osxkeychain.c
Expand Down