git: 2af1c61bab3a - main - devel/git: Update to 2.47.0

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Renato Botelho <garga_at_FreeBSD.org>
Date: Tue, 08 Oct 2024 21:37:07 UTC
The branch main has been updated by garga:

URL: https://cgit.FreeBSD.org/ports/commit/?id=2af1c61bab3af2848311f43486d27890500fdc63

commit 2af1c61bab3af2848311f43486d27890500fdc63
Author:     Renato Botelho <garga@FreeBSD.org>
AuthorDate: 2024-10-08 16:28:12 +0000
Commit:     Renato Botelho <garga@FreeBSD.org>
CommitDate: 2024-10-08 21:36:43 +0000

    devel/git: Update to 2.47.0
    
    Sponsored by:   Rubicon Communications, LLC ("Netgate")
---
 devel/git/Makefile  |  2 +-
 devel/git/distinfo  | 14 +++++++-------
 devel/git/pkg-plist |  2 ++
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/devel/git/Makefile b/devel/git/Makefile
index cc68b40e44cc..c6ee8b160b15 100644
--- a/devel/git/Makefile
+++ b/devel/git/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	git
-DISTVERSION=	2.46.2
+DISTVERSION=	2.47.0
 CATEGORIES=	devel
 MASTER_SITES=	KERNEL_ORG/software/scm/git
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
diff --git a/devel/git/distinfo b/devel/git/distinfo
index 49e386ff2273..b51a46388ee3 100644
--- a/devel/git/distinfo
+++ b/devel/git/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1727179731
-SHA256 (git-2.46.2.tar.xz) = 5ee8a1c68536094a4f7f9515edc154b12a275b8a57dda4c21ecfbf1afbae2ca3
-SIZE (git-2.46.2.tar.xz) = 7581344
-SHA256 (git-manpages-2.46.2.tar.xz) = fe995b99b0b622fd4f414c40a02ede3875cddd5816e2632ec1808bae5c94c2ae
-SIZE (git-manpages-2.46.2.tar.xz) = 584812
-SHA256 (git-htmldocs-2.46.2.tar.xz) = 904ea118aeae65d17cf824512701531a97a2019e636fd693eb23780d5c072c63
-SIZE (git-htmldocs-2.46.2.tar.xz) = 1553104
+TIMESTAMP = 1728389640
+SHA256 (git-2.47.0.tar.xz) = 1ce114da88704271b43e027c51e04d9399f8c88e9ef7542dae7aebae7d87bc4e
+SIZE (git-2.47.0.tar.xz) = 7652728
+SHA256 (git-manpages-2.47.0.tar.xz) = c8dfefa07bddc9e5c2aa48ff03e80a3461d9baa45f46b17b1a43c8e132b1fab8
+SIZE (git-manpages-2.47.0.tar.xz) = 586352
+SHA256 (git-htmldocs-2.47.0.tar.xz) = fab133e8ef4cf825f5014d2fc708461e7a383fd90e52fbbae0b14ca12ede17b6
+SIZE (git-htmldocs-2.47.0.tar.xz) = 1564012
diff --git a/devel/git/pkg-plist b/devel/git/pkg-plist
index 5559d04ee375..01924e2e50c7 100644
--- a/devel/git/pkg-plist
+++ b/devel/git/pkg-plist
@@ -212,6 +212,7 @@ libexec/git-core/mergetools/smerge
 libexec/git-core/mergetools/tkdiff
 libexec/git-core/mergetools/tortoisemerge
 libexec/git-core/mergetools/vimdiff
+libexec/git-core/mergetools/vscode
 libexec/git-core/mergetools/winmerge
 libexec/git-core/mergetools/xxdiff
 libexec/git-core/scalar
@@ -853,6 +854,7 @@ share/man/man7/gitworkflows.7.gz
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.46.0.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.46.1.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.46.2.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.47.0.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.0.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.1.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.2.txt