From 36b4417c808b3e3f3249cde54e81075f37695662 Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Mon, 18 Mar 2019 21:13:48 +0200
Subject: [PATCH] git: enable 'contrib/subtree'

---
 packages/git/build.sh | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/packages/git/build.sh b/packages/git/build.sh
index ec86ad891..edb2df223 100644
--- a/packages/git/build.sh
+++ b/packages/git/build.sh
@@ -4,6 +4,7 @@ TERMUX_PKG_LICENSE="GPL-2.0"
 # less is required as a pager for git log, and the busybox less does not handle used escape sequences.
 TERMUX_PKG_DEPENDS="libcurl, less, openssl, pcre2"
 TERMUX_PKG_VERSION=2.21.0
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=8ccb1ce743ee991d91697e163c47c11be4bf81efbdd9fb0b4a7ad77cc0020d28
 TERMUX_PKG_SRCURL=https://www.kernel.org/pub/software/scm/git/git-${TERMUX_PKG_VERSION}.tar.xz
 ## This requires a working $TERMUX_PREFIX/bin/sh on the host building:
@@ -53,10 +54,21 @@ termux_step_pre_configure() {
 	CPPFLAGS="-I$TERMUX_PKG_SRCDIR $CPPFLAGS"
 }
 
-termux_step_post_make_install() {
+termux_step_make() {
+	make -j $TERMUX_MAKE_PROCESSES $TERMUX_PKG_EXTRA_MAKE_ARGS
+	make -j $TERMUX_MAKE_PROCESSES -C contrib/subtree $TERMUX_PKG_EXTRA_MAKE_ARGS
+}
+
+termux_step_make_install() {
+	make $TERMUX_PKG_EXTRA_MAKE_ARGS install
+	make -C contrib/subtree $TERMUX_PKG_EXTRA_MAKE_ARGS install
+
 	# Installing man requires asciidoc and xmlto, so git uses separate make targets for man pages
 	make -j $TERMUX_MAKE_PROCESSES install-man
+	make -j $TERMUX_MAKE_PROCESSES -C contrib/subtree install-man
+}
 
+termux_step_post_make_install() {
 	mkdir -p $TERMUX_PREFIX/etc/bash_completion.d/
 	cp $TERMUX_PKG_SRCDIR/contrib/completion/git-completion.bash \
 	   $TERMUX_PKG_SRCDIR/contrib/completion/git-prompt.sh \