X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/8c732a3581e634e389045005d40cea65057b331b..295241d4043c55a41259b4846464e1668b2f6a5f:/packages/git/build.sh

diff --git a/packages/git/build.sh b/packages/git/build.sh
index db94a43e..047e6bfb 100755
--- a/packages/git/build.sh
+++ b/packages/git/build.sh
@@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://git-scm.com/
 TERMUX_PKG_DESCRIPTION="Distributed version control system designed to handle everything from small to very large projects with speed and efficiency"
 # less is required as a pager for git log, and the busybox less does not handle used escape sequences.
 TERMUX_PKG_DEPENDS="libcurl, less"
-TERMUX_PKG_VERSION=2.12.0
+TERMUX_PKG_VERSION=2.13.0
 TERMUX_PKG_SRCURL=https://www.kernel.org/pub/software/scm/git/git-${TERMUX_PKG_VERSION}.tar.xz
-TERMUX_PKG_SHA256=1821766479062d052cc1897d0ded95212e81e5c7f1039786bc4aec2225a32027
+TERMUX_PKG_SHA256=4bbf2ab6f2341253a38f95306ec7936833eb1c42572da5c1fa61f0abb2191258
 ## This requires a working $TERMUX_PREFIX/bin/sh on the host building:
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 ac_cv_fread_reads_directories=yes
@@ -40,6 +40,9 @@ termux_step_pre_configure () {
 	# remains without bumped modification times, so are not picked
 	# up by the package):
 	rm -Rf $TERMUX_PREFIX/share/git-perl
+
+	# Fixes build if utfcpp is installed:
+	CPPFLAGS="-I$TERMUX_PKG_SRCDIR $CPPFLAGS"
 }
 
 termux_step_post_make_install () {
@@ -63,7 +66,6 @@ termux_step_post_make_install () {
 
 termux_step_post_massage () {
 	if [ ! -f libexec/git-core/git-remote-https ]; then
-		echo "ERROR: Built without https support"
-		exit 1
+		termux_error_exit "Git built without https support"
 	fi
 }