From 43d02b003239bc0319f9e6e03c58d0b45c77bb0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 27 Dec 2019 19:59:04 +0700
Subject: [PATCH 1/2] git: update to 2.25.0

t3900 is passed on both musl and glibc now.
---
 srcpkgs/git/patches/git-p4-python-3.patch |  8 ++++++++
 srcpkgs/git/template                      | 12 +++++-------
 2 files changed, 13 insertions(+), 7 deletions(-)
 create mode 100644 srcpkgs/git/patches/git-p4-python-3.patch

diff --git a/srcpkgs/git/patches/git-p4-python-3.patch b/srcpkgs/git/patches/git-p4-python-3.patch
new file mode 100644
index 00000000000..fd1fcfab8d4
--- /dev/null
+++ b/srcpkgs/git/patches/git-p4-python-3.patch
@@ -0,0 +1,8 @@
+--- git-p4.py
++++ git-p4.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+ #
+ # git-p4.py -- A tool for bidirectional operation between a Perforce depot and git.
+ #
diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index b413bacbbb7..a1d09c0d7bd 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -1,7 +1,7 @@
 # Template file for 'git'
 pkgname=git
-version=2.24.1
-revision=2
+version=2.25.0
+revision=1
 build_style=gnu-configure
 configure_args="--with-curl --with-expat --with-tcltk --with-libpcre2
  ac_cv_snprintf_returns_bogus=no ac_cv_fread_reads_directories=yes"
@@ -16,14 +16,15 @@ license="GPL-2.0-only"
 homepage="https://git-scm.com/"
 changelog="https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/${version}.txt"
 distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
-checksum=723f24dce8fdd621a308b6187553fce7d5244205c065fe0a3aebd0b7c3f88562
+checksum=c060291a3ffb43d7c99f4aa5c4d37d3751cf6bca683e7344ea407ea504d9a8d0
 replaces="git-perl>=0"
 register_shell=/usr/bin/git-shell
 
 subpackages="git-cvs git-svn gitk git-gui git-all git-libsecret git-netrc"
 
 case "$XBPS_TARGET_MACHINE" in
-	*-musl) export GIT_SKIP_TESTS='t3900' ;;
+	*-musl) configure_args+=" ac_cv_iconv_omits_bom=yes" ;;
+	*) configure_args+=" ac_cv_iconv_omits_bom=no" ;;
 esac
 
 post_configure() {
@@ -32,9 +33,6 @@ post_configure() {
 	INSTALLDIRS=vendor
 	perllibdir=/usr/share/perl5/vendor_perl
 	EOF
-	case "$XBPS_TARGET_MACHINE" in
-		*-musl) echo "ICONV_OMITS_BOM=Yes" >>config.mak ;;
-	esac
 }
 
 post_build() {

From 2c66f6aaa096740d66d48ea6a3046240807298e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 14 Jan 2020 07:47:21 +0700
Subject: [PATCH 2/2] chroot-git: update to 2.25.0.

---
 srcpkgs/chroot-git/template | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/chroot-git/template b/srcpkgs/chroot-git/template
index 60d484fdcba..3f9dd9e9925 100644
--- a/srcpkgs/chroot-git/template
+++ b/srcpkgs/chroot-git/template
@@ -1,7 +1,7 @@
 # Template file for 'chroot-git'
 pkgname=chroot-git
-version=2.24.1
-revision=2
+version=2.25.0
+revision=1
 bootstrap=yes
 wrksrc="git-${version}"
 build_style=gnu-configure
@@ -15,22 +15,26 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://git-scm.com/"
 distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
-checksum=723f24dce8fdd621a308b6187553fce7d5244205c065fe0a3aebd0b7c3f88562
+checksum=c060291a3ffb43d7c99f4aa5c4d37d3751cf6bca683e7344ea407ea504d9a8d0
 
 if [ "$CHROOT_READY" ]; then
-	hostmakedepends="perl gettext tar"
+	hostmakedepends="tar"
 else
 	configure_args+=" --with-zlib=${XBPS_MASTERDIR}/usr"
 fi
 
+case "$XBPS_TARGET_MACHINE" in
+	*-musl) configure_args+=" ac_cv_iconv_omits_bom=yes" ;;
+	*) configure_args+=" ac_cv_iconv_omits_bom=no" ;;
+esac
+
 post_configure() {
 	cat <<-EOF >config.mak
 	CC_LD_DYNPATH=-L
 	NO_INSTALL_HARDLINKS=Yes
+	NO_GETTEXT=YesPlease
+	NO_PERL=YesPlease
 	EOF
-	case "$XBPS_TARGET_MACHINE" in
-		*-musl) echo "ICONV_OMITS_BOM=Yes" >>config.mak ;;
-	esac
 }
 
 do_install() {