From eade35355142bdca47a168c7ef5f7ea766467fe7 Mon Sep 17 00:00:00 2001
From: Glen Barber <gjb@FreeBSD.org>
Date: Thu, 27 Aug 2020 14:29:06 +0000
Subject: [PATCH] Do not unconditionally build git from ports if it already
 exists.

Sponsored by:	Rubicon Communications, LLC (netgate.com)
---
 release/release.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/release/release.sh b/release/release.sh
index 185a7d08c23..47b868dbcf9 100755
--- a/release/release.sh
+++ b/release/release.sh
@@ -265,7 +265,8 @@ extra_chroot_setup() {
 
 	# Install git from ports or packages if the ports tree is
 	# available and VCSCMD is unset.
-	if [ -d ${CHROOTDIR}/usr/ports ]; then
+	_gitcmd="$(which git)"
+	if [ -d ${CHROOTDIR}/usr/ports -a ! -z "${_gitcmd}" ]; then
 		# Trick the ports 'run-autotools-fixup' target to do the right
 		# thing.
 		_OSVERSION=$(chroot ${CHROOTDIR} /usr/bin/uname -U)