From 0fda149dad50a72dd0b4cc974c0e0c1014c7adb8 Mon Sep 17 00:00:00 2001
From: Glen Barber <gjb@FreeBSD.org>
Date: Sat, 29 Aug 2020 21:42:59 +0000
Subject: Remove the VCSUPDATE command, because git is too stupid to have the
 '-C <directory>' after the subcommand.

Meanwhile, hard-code 'git -C <...> pull' for now.

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

(limited to 'release/release.sh')

diff --git a/release/release.sh b/release/release.sh
index f6632880b3df..292ba16a36e1 100755
--- a/release/release.sh
+++ b/release/release.sh
@@ -70,7 +70,6 @@ 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/.
@@ -222,21 +221,21 @@ chroot_setup() {
 
 	if [ -z "${SRC_UPDATE_SKIP}" ]; then
 		if [ -d "${CHROOTDIR}/usr/src/.git" ]; then
-			${VCSUPDATE} -C ${CHROOTDIR}/usr/src
+			git -C ${CHROOTDIR}/usr/src pull
 		else
 			${VCSCMD} ${SRC} -b ${SRCBRANCH} ${CHROOTDIR}/usr/src
 		fi
 	fi
 	if [ -z "${NODOC}" ] && [ -z "${DOC_UPDATE_SKIP}" ]; then
 		if [ -d "${CHROOTDIR}/usr/doc/.git" ]; then
-			${VCSUPDATE} -C ${CHROOTDIR}/usr/doc
+			git -C ${CHROOTDIR}/usr/doc pull
 		else
 			${VCSCMD} ${DOC} -b ${DOCBRANCH} ${CHROOTDIR}/usr/doc
 		fi
 	fi
 	if [ -z "${NOPORTS}" ] && [ -z "${PORTS_UPDATE_SKIP}" ]; then
 		if [ -d "${CHROOTDIR}/usr/ports/.git" ]; then
-			${VCSUPDATE} -C ${CHROOTDIR}/usr/ports
+			git -C ${CHROOTDIR}/usr/ports pull
 		else
 			${VCSCMD} ${PORT} -b ${PORTBRANCH} ${CHROOTDIR}/usr/ports
 		fi
-- 
cgit v1.2.3