Merge branch 'apkfoundry' into 'master'3.4.2

Add interposition fixes for use with APK Foundry

See merge request adelie/abuild!5

1 files changed, 3 insertions, 2 deletions

diff --git a/apkgrel.in b/apkgrel.in
index fd63271..31fe27b 100644
--- a/apkgrel.in
+++ b/apkgrel.in
@@ -45,7 +45,7 @@ do_add () {
 	local f= old=
 	for f; do
 		[ -n "$only_clean_git" ] \
-			&& [ -n "$(git diff --name-only "${f%/*}")" ] \
+			&& [ -n "$($ABUILD_GIT diff --name-only "${f%/*}")" ] \
 			&& continue
 		old=$(show_plain "$f")
 		case $old in
@@ -107,7 +107,8 @@ while true; do
 		-z|--zero) setto=0; cmd=do_set;;
 		-a|--add) cmd=do_add;;
 		-g|--clean-git) # verify that we're in a git tree
-				git rev-parse 2>/dev/null || die "not in a git tree"
+				[ "$ABUILD_GIT" != "true" ] || die "can't locate git command"
+				$ABUILD_GIT rev-parse 2>/dev/null || die "not in a git tree"
 				cmd=do_add
 				only_clean_git=1;;
 		-s|--set) setto=$2; shift; cmd=do_set;;