Klemens Nanni <k...@openbsd.org> writes: > Lots of fixes and improvements: > > https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/2.32.0.txt
Thanks for including this link! > OK? OK gnezdo@ I'm surprised the new git-checkout--worker binary isn't mentioned in the changelog. > > Index: Makefile > =================================================================== > RCS file: /cvs/ports/devel/git/Makefile,v > retrieving revision 1.231 > diff -u -p -r1.231 Makefile > --- Makefile 28 Mar 2021 08:18:28 -0000 1.231 > +++ Makefile 7 Jun 2021 09:52:45 -0000 > @@ -4,7 +4,7 @@ COMMENT-main = distributed version contr > COMMENT-svn = subversion interoperability tools > COMMENT-x11 = graphical tools > > -V = 2.31.1 > +V = 2.32.0 > DISTNAME = git-${V} > PKGNAME-main = ${DISTNAME} > PKGNAME-svn = git-svn-${V} > Index: distinfo > =================================================================== > RCS file: /cvs/ports/devel/git/distinfo,v > retrieving revision 1.170 > diff -u -p -r1.170 distinfo > --- distinfo 28 Mar 2021 08:18:28 -0000 1.170 > +++ distinfo 7 Jun 2021 09:53:23 -0000 > @@ -1,4 +1,4 @@ > -SHA256 (git-2.31.1.tar.gz) = RtN8Ip6deGUQ4MU7YAZXBM6S1a7cFvLFER4+01CTv6c= > -SHA256 (git-manpages-2.31.1.tar.gz) = > 0zBJiqrqaSiwq7u7iW9vYF79jTXyPLuy3jjIenN9RUM= > -SIZE (git-2.31.1.tar.gz) = 10128216 > -SIZE (git-manpages-2.31.1.tar.gz) = 806338 > +SHA256 (git-2.32.0.tar.gz) = YDjwbTlrqdqy7uVBx9tuf5+Efxgexi89hEGJP4xGk5g= > +SHA256 (git-manpages-2.32.0.tar.gz) = > tVM8QOoWiCMcDi31HMDRwCcuF/54pFum5gy49h+kpTw= > +SIZE (git-2.32.0.tar.gz) = 10321570 > +SIZE (git-manpages-2.32.0.tar.gz) = 813553 > Index: patches/patch-gitweb_gitweb_perl > =================================================================== > RCS file: /cvs/ports/devel/git/patches/patch-gitweb_gitweb_perl,v > retrieving revision 1.35 > diff -u -p -r1.35 patch-gitweb_gitweb_perl > --- patches/patch-gitweb_gitweb_perl 3 Jun 2020 09:28:53 -0000 1.35 > +++ patches/patch-gitweb_gitweb_perl 7 Jun 2021 09:58:19 -0000 > @@ -5,7 +5,7 @@ This prevents the following error: '-T a > Index: gitweb/gitweb.perl > --- gitweb/gitweb.perl.orig > +++ gitweb/gitweb.perl > -@@ -7054,7 +7054,7 @@ sub git_blob_plain { > +@@ -7071,7 +7071,7 @@ sub git_blob_plain { > $expires = "+1d"; > } > > @@ -14,7 +14,7 @@ Index: gitweb/gitweb.perl > or die_error(500, "Open git-cat-file blob '$hash' failed"); > > # content-type (can include charset) > -@@ -7117,7 +7117,7 @@ sub git_blob { > +@@ -7134,7 +7134,7 @@ sub git_blob { > } > > my $have_blame = gitweb_check_feature('blame'); > Index: patches/patch-t_t9117-git-svn-init-clone_sh > =================================================================== > RCS file: patches/patch-t_t9117-git-svn-init-clone_sh > diff -N patches/patch-t_t9117-git-svn-init-clone_sh > --- patches/patch-t_t9117-git-svn-init-clone_sh 26 Jun 2019 15:07:57 > -0000 1.3 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -1,11 +0,0 @@ > -$OpenBSD: patch-t_t9117-git-svn-init-clone_sh,v 1.3 2019/06/26 15:07:57 kn > Exp $ > ---- t/t9117-git-svn-init-clone.sh.pat.orig Thu Dec 25 06:33:25 2008 > -+++ t/t9117-git-svn-init-clone.sh Thu Dec 25 19:25:32 2008 > -@@ -8,7 +8,6 @@ test_description='git svn init/clone tests' > - . ./lib-git-svn.sh > - > - # setup, run inside tmp so we don't have any conflicts with $svnrepo > --set -e > - rm -r .git > - mkdir tmp > - cd tmp > Index: pkg/PLIST-main > =================================================================== > RCS file: /cvs/ports/devel/git/pkg/PLIST-main,v > retrieving revision 1.101 > diff -u -p -r1.101 PLIST-main > --- pkg/PLIST-main 16 Mar 2021 19:06:52 -0000 1.101 > +++ pkg/PLIST-main 7 Jun 2021 10:27:18 -0000 > @@ -41,6 +41,7 @@ libexec/git/git-bisect > @bin libexec/git/git-check-mailmap > @bin libexec/git/git-check-ref-format > @bin libexec/git/git-checkout > +@bin libexec/git/git-checkout--worker > @bin libexec/git/git-checkout-index > @bin libexec/git/git-cherry > @bin libexec/git/git-cherry-pick