diff options
| author | Cy Schubert <cy@FreeBSD.org> | 2023-03-14 13:55:46 -0700 |
|---|---|---|
| committer | Cy Schubert <cy@FreeBSD.org> | 2023-03-15 10:39:09 -0700 |
| commit | d3a5eb641d287192007f016bed2df0644ebe6184 (patch) | |
| tree | 182a3d75c2e5ddcb158b44c636af41c918785546 | |
| parent | b9452f5c1460ff776391db8ce37ec335f17522c5 (diff) | |
| download | freebsd-ports-d3a5eb641d287192007f016bed2df0644ebe6184.zip | |
devel/git: Update to 2.4.0
Changelog at https://github.com/git/git/blob/master/Documentation/RelNotes/2.4.0.txt.
This update fixes a long-standing problem with git rebase of some
(but not all) merges from the vendor branch, resulting in subsequently
rebased files being placed into the root of the repo tree.
PR: 270222
Submitted by: cy
Reported by: cy
Approved by: garga
| -rw-r--r-- | devel/git/Makefile | 2 | ||||
| -rw-r--r-- | devel/git/distinfo | 14 | ||||
| -rw-r--r-- | devel/git/pkg-plist | 6 |
3 files changed, 10 insertions, 12 deletions
diff --git a/devel/git/Makefile b/devel/git/Makefile index 6a3b647bc821..2863bf92ab94 100644 --- a/devel/git/Makefile +++ b/devel/git/Makefile @@ -1,5 +1,5 @@ PORTNAME= git -DISTVERSION= 2.39.2 +DISTVERSION= 2.40.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 61ea129958f8..d0b2621740ef 100644 --- a/devel/git/distinfo +++ b/devel/git/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1676410579 -SHA256 (git-2.39.2.tar.xz) = 475f75f1373b2cd4e438706185175966d5c11f68c4db1e48c26257c43ddcf2d6 -SIZE (git-2.39.2.tar.xz) = 7163224 -SHA256 (git-manpages-2.39.2.tar.xz) = 0b3927a2f09db3d3ec91dd548409a7129d3af9dabf11847401872c8c0c529b25 -SIZE (git-manpages-2.39.2.tar.xz) = 557080 -SHA256 (git-htmldocs-2.39.2.tar.xz) = f729edf1821c688efc6767b1c0bb728aec673bc15b80a6b8be6a18c2cbb9d67e -SIZE (git-htmldocs-2.39.2.tar.xz) = 1505352 +TIMESTAMP = 1678830139 +SHA256 (git-2.40.0.tar.xz) = b17a598fbf58729ef13b577465eb93b2d484df1201518b708b5044ff623bf46d +SIZE (git-2.40.0.tar.xz) = 7183692 +SHA256 (git-manpages-2.40.0.tar.xz) = 5766aecf137370015e3fd72e355b83c73dc2aa2ee14a42546049346442c3356e +SIZE (git-manpages-2.40.0.tar.xz) = 562824 +SHA256 (git-htmldocs-2.40.0.tar.xz) = 3da9fbe542e7d565b4168ea15872e8e1b13324e4bb5ab65604ca9a333dfe37bb +SIZE (git-htmldocs-2.40.0.tar.xz) = 1517292 diff --git a/devel/git/pkg-plist b/devel/git/pkg-plist index 7ebe62bb2b81..ac71bee9217e 100644 --- a/devel/git/pkg-plist +++ b/devel/git/pkg-plist @@ -26,14 +26,12 @@ etc/bash_completion.d/git-completion.bash %%PERL%%%%SITE_PERL%%/Git/SVN/Utils.pm libexec/git-core/git libexec/git-core/git-add -libexec/git-core/git-add--interactive libexec/git-core/git-am libexec/git-core/git-annotate libexec/git-core/git-apply libexec/git-core/git-archimport libexec/git-core/git-archive libexec/git-core/git-bisect -libexec/git-core/git-bisect--helper libexec/git-core/git-blame libexec/git-core/git-branch libexec/git-core/git-bugreport @@ -69,7 +67,6 @@ libexec/git-core/git-diff-index libexec/git-core/git-diff-tree libexec/git-core/git-difftool libexec/git-core/git-difftool--helper -libexec/git-core/git-env--helper libexec/git-core/git-fast-export libexec/git-core/git-fast-import libexec/git-core/git-fetch @@ -813,6 +810,8 @@ man/man7/gitworkflows.7.gz %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.39.0.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.39.1.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.39.2.txt +%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.39.3.txt +%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.40.0.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.0.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.1.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.2.txt @@ -1316,7 +1315,6 @@ share/emacs/site-lisp/git/git.el %%CONTRIB%%share/git-core/contrib/coccinelle/free.cocci %%CONTRIB%%share/git-core/contrib/coccinelle/hashmap.cocci %%CONTRIB%%share/git-core/contrib/coccinelle/index-compatibility.cocci -%%CONTRIB%%share/git-core/contrib/coccinelle/index-compatibility.pending.cocci %%CONTRIB%%share/git-core/contrib/coccinelle/object_id.cocci %%CONTRIB%%share/git-core/contrib/coccinelle/preincr.cocci %%CONTRIB%%share/git-core/contrib/coccinelle/qsort.cocci |