Re: update git to 2.21.0

On 25/02/2019 12:04, Klemens Nanni wrote:
> Lots of fixes (nothing critical), performance improvements, etc.
>
> https://github.com/git/git/blob/v2.21.0/Documentation/RelNotes/2.21.0.txt
>
> Tests pass on amd64:
>
> fixed 1
> success 19851
> failed 0
> broken 260
> total 20458
>
> OK?

ok benoit@

>
> Index: devel/git/Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/git/Makefile,v
> retrieving revision 1.197
> diff -u -p -r1.197 Makefile
> --- devel/git/Makefile 26 Jan 2019 11:48:18 -0000 1.197
> +++ devel/git/Makefile 25 Feb 2019 09:17:00 -0000
> @@ -4,7 +4,7 @@ COMMENT-main = GIT - Tree History Storag
> COMMENT-svn = GIT - subversion interoperability tools
> COMMENT-x11 = GIT - graphical tools
>
> -V = 2.20.1
> +V = 2.21.0
> DISTNAME = git-${V}
> PKGNAME-main = ${DISTNAME}
> PKGNAME-svn = git-svn-${V}
> Index: devel/git/distinfo
> ===================================================================
> RCS file: /cvs/ports/devel/git/distinfo,v
> retrieving revision 1.149
> diff -u -p -r1.149 distinfo
> --- devel/git/distinfo 16 Dec 2018 13:53:22 -0000 1.149
> +++ devel/git/distinfo 25 Feb 2019 09:17:21 -0000
> @@ -1,4 +1,4 @@
> -SHA256 (git-2.20.1.tar.gz) = 7cO8FJW2kXm6Ticul+/5MzSiDeyx2Ntuw8GcFkF3OP0=
> -SHA256 (git-manpages-2.20.1.tar.gz) = 6cEjRjq9BeFC3v5EqAYM5umFPf2Mg7JULji33qxObUw=
> -SIZE (git-2.20.1.tar.gz) = 7962304
> -SIZE (git-manpages-2.20.1.tar.gz) = 713938
> +SHA256 (git-2.21.0.tar.gz) = heylHHQE2nXjU+ulh/h/6pSBukHhYiBqb3CtgRgUe+4=
> +SHA256 (git-manpages-2.21.0.tar.gz) = FMduu04x+eVc9TOKBP06E7ztAyPNUXlMz0X8dL0MEIA=
> +SIZE (git-2.21.0.tar.gz) = 8289375
> +SIZE (git-manpages-2.21.0.tar.gz) = 716556
> Index: devel/git/patches/patch-config_mak_uname
> ===================================================================
> RCS file: /cvs/ports/devel/git/patches/patch-config_mak_uname,v
> retrieving revision 1.7
> diff -u -p -r1.7 patch-config_mak_uname
> --- devel/git/patches/patch-config_mak_uname 13 Sep 2018 05:59:22 -0000 1.7
> +++ devel/git/patches/patch-config_mak_uname 25 Feb 2019 09:22:36 -0000
> @@ -5,7 +5,7 @@ OpenBSD wants DIR_HAS_BSD_GROUP_SEMANTIC
> Index: config.mak.uname
> --- config.mak.uname.orig
> +++ config.mak.uname
> -@@ -225,6 +225,7 @@ endif
> +@@ -226,6 +226,7 @@ endif
> ifeq ($(uname_S),OpenBSD)
> NO_STRCASESTR = YesPlease
> NO_MEMMEM = YesPlease
> Index: devel/git/patches/patch-t_t1450-fsck_sh
> ===================================================================
> RCS file: devel/git/patches/patch-t_t1450-fsck_sh
> diff -N devel/git/patches/patch-t_t1450-fsck_sh
> --- devel/git/patches/patch-t_t1450-fsck_sh 16 Dec 2018 13:53:22 -0000 1.7
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,16 +0,0 @@
> -$OpenBSD: patch-t_t1450-fsck_sh,v 1.7 2018/12/16 13:53:22 kn Exp $
> -
> -Avoid GNU grep syntax
> -
> -Index: t/t1450-fsck.sh
> ---- t/t1450-fsck.sh.orig
> -+++ t/t1450-fsck.sh
> -@@ -629,7 +629,7 @@ test_expect_success 'fsck --name-objects' '
> - remove_object $(git rev-parse julius:caesar.t) &&
> - test_must_fail git fsck --name-objects >out &&
> - tree=$(git rev-parse --verify julius:) &&
> -- egrep "$tree \((refs/heads/master|HEAD)@\{[0-9]*\}:" out
> -+ grep -E "$tree \(refs/heads/master|HEAD@{[0-9]*}:" out
> - )
> - '
> -
> Index: devel/git/patches/patch-t_test-lib_sh
> ===================================================================
> RCS file: /cvs/ports/devel/git/patches/patch-t_test-lib_sh,v
> retrieving revision 1.29
> diff -u -p -r1.29 patch-t_test-lib_sh
> --- devel/git/patches/patch-t_test-lib_sh 16 Dec 2018 13:53:22 -0000 1.29
> +++ devel/git/patches/patch-t_test-lib_sh 25 Feb 2019 09:22:22 -0000
> @@ -6,8 +6,8 @@ wants it badly.
> Index: t/test-lib.sh
> --- t/test-lib.sh.orig
> +++ t/test-lib.sh
> -@@ -71,6 +71,11 @@ then
> - exit 1
> +@@ -294,6 +294,11 @@ then
> + exit $stress_exit
> fi
>
> +if [ -n "${TEST_TAR}" ]; then
> @@ -17,4 +17,4 @@ Index: t/test-lib.sh
> +
> # if --tee was passed, write the output not only to the terminal, but
> # additionally to the file test-results/$BASENAME.out, too.
> - case "$GIT_TEST_TEE_STARTED, $* " in
> + if test "$GIT_TEST_TEE_STARTED" = "done"
> Index: devel/git/pkg/PLIST-main
> ===================================================================
> RCS file: /cvs/ports/devel/git/pkg/PLIST-main,v
> retrieving revision 1.87
> diff -u -p -r1.87 PLIST-main
> --- devel/git/pkg/PLIST-main 26 Jan 2019 11:48:18 -0000 1.87
> +++ devel/git/pkg/PLIST-main 25 Feb 2019 09:26:42 -0000
> @@ -123,7 +123,6 @@ libexec/git/git-quiltimport
> libexec/git/git-rebase--am
> libexec/git/git-rebase--common
> @bin libexec/git/git-rebase--interactive
> -libexec/git/git-rebase--merge
> libexec/git/git-rebase--preserve-merges
> @bin libexec/git/git-receive-pack
> @bin libexec/git/git-reflog
> @@ -417,6 +416,7 @@ share/gitweb/static/gitweb.js
> share/locale/bg/LC_MESSAGES/git.mo
> share/locale/ca/LC_MESSAGES/git.mo
> share/locale/de/LC_MESSAGES/git.mo
> +share/locale/el/LC_MESSAGES/git.mo
> share/locale/es/LC_MESSAGES/git.mo
> share/locale/fr/LC_MESSAGES/git.mo
> share/locale/is/
>