From 91edfc6ca507aaec2816b7fa9f26b0834a8aeb5a Mon Sep 17 00:00:00 2001
From: Glen Barber <gjb@FreeBSD.org>
Date: Sat, 29 Aug 2020 15:50:27 +0000
Subject: [PATCH] Add a VCSUPDATE command to run 'git pull' instead of 'git
 clone' if the tree already exists.

Reported by:	Michael Butler
Sponsored by:	Rubicon Communications, LLC (netgate.com)
---
 release/release.sh | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/release/release.sh b/release/release.sh
index ab295b95c2e..8d38368b61a 100755
--- a/release/release.sh
+++ b/release/release.sh
@@ -70,6 +70,7 @@ env_setup() {
 		exit 1
 	fi
 	VCSCMD="/usr/local/bin/git clone -q"
+	VCSUPDATE="/usr/local/bin/git pull -q"
 
 	# The default git checkout server, and branches for src/, doc/,
 	# and ports/.
@@ -220,13 +221,25 @@ chroot_setup() {
 	mkdir -p ${CHROOTDIR}/usr
 
 	if [ -z "${SRC_UPDATE_SKIP}" ]; then
-		${VCSCMD} ${SRC} -b ${SRCBRANCH} ${CHROOTDIR}/usr/src
+		if [ -d "${CHROOTDIR}/usr/src" ]; then
+			cd ${CHROOTDIR}/usr/src && ${VCSUPDATE} && cd -
+		else
+			${VCSCMD} ${SRC} -b ${SRCBRANCH} ${CHROOTDIR}/usr/src
+		fi
 	fi
 	if [ -z "${NODOC}" ] && [ -z "${DOC_UPDATE_SKIP}" ]; then
-		${VCSCMD} ${DOC} -b ${DOCBRANCH} ${CHROOTDIR}/usr/doc
+		if [ -d "${CHROOTDIR}/usr/doc" ]; then
+			cd ${CHROOTDIR}/usr/doc && ${VCSUPDATE} && cd -
+		else
+			${VCSCMD} ${DOC} -b ${DOCBRANCH} ${CHROOTDIR}/usr/doc
+		fi
 	fi
 	if [ -z "${NOPORTS}" ] && [ -z "${PORTS_UPDATE_SKIP}" ]; then
-		${VCSCMD} ${PORT} -b ${PORTBRANCH} ${CHROOTDIR}/usr/ports
+		if [ -d "${CHROOTDIR}/usr/ports" ]; then
+			cd ${CHROOTDIR}/usr/ports && ${VCSUPDATE} && cd -
+		else
+			${VCSCMD} ${PORT} -b ${PORTBRANCH} ${CHROOTDIR}/usr/ports
+		fi
 	fi
 
 	if [ -z "${CHROOTBUILD_SKIP}" ]; then
-- 
2.45.0