Lots of changes, please see
https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/2.24.0.txt

OK?


Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/git/Makefile,v
retrieving revision 1.206
diff -u -p -r1.206 Makefile
--- Makefile    3 Nov 2019 15:27:44 -0000       1.206
+++ Makefile    5 Nov 2019 19:56:38 -0000
@@ -4,8 +4,7 @@ COMMENT-main =  distributed version contr
 COMMENT-svn =  subversion interoperability tools
 COMMENT-x11 =  graphical tools
 
-V =            2.23.0
-REVISION =     2
+V =            2.24.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.152
diff -u -p -r1.152 distinfo
--- distinfo    26 Aug 2019 23:35:24 -0000      1.152
+++ distinfo    5 Nov 2019 19:57:31 -0000
@@ -1,4 +1,4 @@
-SHA256 (git-2.23.0.tar.gz) = 4zlskIiBEaAb9gc0bbCbD79JqVvIP6+VBrYRlZNvDP4=
-SHA256 (git-manpages-2.23.0.tar.gz) = 
pbCZj5XCKQOG0ZHTR4DRRepn5Sf6yYVB4DUHSb92vnU=
-SIZE (git-2.23.0.tar.gz) = 8641922
-SIZE (git-manpages-2.23.0.tar.gz) = 737985
+SHA256 (git-2.24.0.tar.gz) = rREDDS6sZW7p6IYvVtFhBVD3hnGBvv+BTHcSqZGS6Z0=
+SHA256 (git-manpages-2.24.0.tar.gz) = 
zplfhvRBtWqx/QeIqUeGkEri4piecZH9aAYAAwETZtc=
+SIZE (git-2.24.0.tar.gz) = 8716677
+SIZE (git-manpages-2.24.0.tar.gz) = 745689
Index: patches/patch-builtin_gc_c
===================================================================
RCS file: /cvs/ports/devel/git/patches/patch-builtin_gc_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-builtin_gc_c
--- patches/patch-builtin_gc_c  3 Nov 2019 15:25:22 -0000       1.1
+++ patches/patch-builtin_gc_c  5 Nov 2019 19:58:19 -0000
@@ -6,7 +6,7 @@ Use HW_PHYSMEM64 to handle ram size > 2G
 Index: builtin/gc.c
 --- builtin/gc.c.orig
 +++ builtin/gc.c
-@@ -244,7 +244,7 @@ static uint64_t total_ram(void)
+@@ -243,7 +243,7 @@ static uint64_t total_ram(void)
  
        if (!sysinfo(&si))
                return si.totalram;
@@ -15,7 +15,7 @@ Index: builtin/gc.c
        int64_t physical_memory;
        int mib[2];
        size_t length;
-@@ -253,9 +253,19 @@ static uint64_t total_ram(void)
+@@ -252,9 +252,19 @@ static uint64_t total_ram(void)
  # if defined(HW_MEMSIZE)
        mib[1] = HW_MEMSIZE;
  # else
Index: patches/patch-t_test-lib_sh
===================================================================
RCS file: /cvs/ports/devel/git/patches/patch-t_test-lib_sh,v
retrieving revision 1.31
diff -u -p -r1.31 patch-t_test-lib_sh
--- patches/patch-t_test-lib_sh 26 Jun 2019 15:07:57 -0000      1.31
+++ patches/patch-t_test-lib_sh 5 Nov 2019 19:58:19 -0000
@@ -4,9 +4,9 @@ Force usage of GNU tar in the test suite
 wants it badly.
 
 Index: t/test-lib.sh
---- t/test-lib.sh.pat.orig
+--- t/test-lib.sh.orig
 +++ t/test-lib.sh
-@@ -308,6 +308,11 @@ then
+@@ -310,6 +310,11 @@ then
        exit $stress_exit
  fi
  
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/devel/git/pkg/PLIST-main,v
retrieving revision 1.90
diff -u -p -r1.90 PLIST-main
--- pkg/PLIST-main      26 Aug 2019 23:35:24 -0000      1.90
+++ pkg/PLIST-main      5 Nov 2019 20:05:05 -0000
@@ -398,6 +398,7 @@ share/git-core/templates/hooks/post-rece
 share/git-core/templates/hooks/post-update.sample
 share/git-core/templates/hooks/pre-applypatch.sample
 share/git-core/templates/hooks/pre-commit.sample
+share/git-core/templates/hooks/pre-merge-commit.sample
 share/git-core/templates/hooks/pre-push.sample
 share/git-core/templates/hooks/pre-rebase.sample
 share/git-core/templates/hooks/pre-receive.sample
@@ -406,6 +407,7 @@ share/git-core/templates/hooks/setgitper
 share/git-core/templates/hooks/update.sample
 share/git-core/templates/info/
 share/git-core/templates/info/exclude
+share/gitk/lib/msgs/zh_cn.msg
 share/gitweb/
 share/gitweb/README
 share/gitweb/gitweb.cgi

Reply via email to