diff --git a/common/environment/configure/autoconf_cache/common-glibc b/common/environment/configure/autoconf_cache/common-glibc
index 62c08b8709..fb862cbd94 100644
--- a/common/environment/configure/autoconf_cache/common-glibc
+++ b/common/environment/configure/autoconf_cache/common-glibc
@@ -30,6 +30,9 @@ glib_cv_have_qsort_r=${glib_cv_have_qsort_r=yes}
 #dbus-glib
 ac_cv_have_abstract_sockets=${ac_cv_have_abstract_sockets=yes}
 
+# git
+ac_cv_iconv_omits_bom=${ac_cv_iconv_omits_bom=no}
+
 # gnucash
 am_cv_scanf_lld=${am_cv_scanf_lld=yes}
 
diff --git a/common/environment/configure/autoconf_cache/common-linux b/common/environment/configure/autoconf_cache/common-linux
index f524addfe6..718c2c36d7 100644
--- a/common/environment/configure/autoconf_cache/common-linux
+++ b/common/environment/configure/autoconf_cache/common-linux
@@ -82,6 +82,10 @@ bash_cv_wcwidth_broken=no
 ac_cv_file__dev_ptmx=yes
 ac_cv_file__dev_ptc=no
 
+# git
+ac_cv_snprintf_returns_bogus=no
+ac_cv_fread_reads_directories=yes
+
 # gnulib
 gl_cv_func_fstatat_zero_flag=yes
 gl_cv_func_memchr_works=yes
diff --git a/common/environment/configure/autoconf_cache/musl-linux b/common/environment/configure/autoconf_cache/musl-linux
index fb24edf449..09d0c1f9c4 100644
--- a/common/environment/configure/autoconf_cache/musl-linux
+++ b/common/environment/configure/autoconf_cache/musl-linux
@@ -175,3 +175,6 @@ ac_cv_sizeof_blkcnt_t=8
 
 # Force detection of musl's iconv
 ac_cv_libiconv_utf8=yes
+
+# musl omits BOM on UTF-16 and UTF-32
+ac_cv_iconv_omits_bom=yes
diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index aea1bb7970..5ac3b8eb45 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -1,11 +1,9 @@
 # Template file for 'git'
 pkgname=git
-version=2.25.1
+version=2.25.2
 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"
-make_check_target=test
+configure_args="--with-curl --with-expat --with-tcltk --with-libpcre2"
 hostmakedepends="asciidoc gettext perl pkg-config tar tk xmlto"
 makedepends="libglib-devel libcurl-devel libsecret-devel pcre2-devel tk-devel"
 # Required by https://
@@ -16,17 +14,12 @@ 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=222796cc6e3bf2f9fd765f8f097daa3c3999bb7865ac88a8c974d98182e29f26
+checksum=9b937103e048e2d3bf964d4132a0e7edccc2583d4ef30bc8a516f93a76de7123
 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) configure_args+=" ac_cv_iconv_omits_bom=yes" ;;
-	*) configure_args+=" ac_cv_iconv_omits_bom=no" ;;
-esac
-
 post_configure() {
 	cat <<-EOF >config.mak
 	NO_INSTALL_HARDLINKS=Yes
@@ -39,10 +32,17 @@ post_build() {
 	make ${makejobs} -C Documentation man
 	make ${makejobs} -C contrib/contacts all git-contacts.1
 	make ${makejobs} -C contrib/diff-highlight all
-	make ${makejobs} -C contrib/subtree all git-subtree.1
+	make ${makejobs} -C contrib/subtree all man
 	make ${makejobs} -C contrib/credential/libsecret
 }
 
+do_check() {
+	make test
+	make -C contrib/diff-highlight test
+	make -C contrib/subtree test
+	make -C contrib/credential/netrc test
+}
+
 post_install() {
 	make DESTDIR=${DESTDIR} install-doc
 	vinstall contrib/completion/git-completion.bash 644 \