From fb6e261c20ebcd94875d623e167369802721f2dd Mon Sep 17 00:00:00 2001
From: Glen Barber <gjb@FreeBSD.org>
Date: Wed, 12 May 2021 10:29:53 -0400
Subject: [PATCH] release: follow-up to previous commit to use Git for the
 ports tree

MFC after:	immediately (pending re approval)
Sponsored by:	Rubicon Communications, LLC ("Netgate")
---
 release/release.sh | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/release/release.sh b/release/release.sh
index 84a7813205f9..87e22e669fd1 100755
--- a/release/release.sh
+++ b/release/release.sh
@@ -222,16 +222,8 @@ chroot_setup() {
 		fi
 	fi
 	if [ -z "${NOPORTS}" ] && [ -z "${PORTS_UPDATE_SKIP}" ]; then
-		# if [ -d "${CHROOTDIR}/usr/ports/.git" ]; then
-			# git -C ${CHROOTDIR}/usr/ports pull -q
-		# XXX: Workaround for the overlap in the Git conversion timeframe.
-		if [ -d "${CHROOTDIR}/usr/ports/.svn" ]; then
-			${SVNCMD} update ${CHROOTDIR}/usr/ports
-		else
-			#${VCSCMD} ${PORT} -b ${PORTBRANCH} ${CHROOTDIR}/usr/ports
-			# XXX: Workaround for the overlap in the Git
-			# conversion timeframe.
-			${SVNCMD} co ${PORT}/${PORTBRANCH} ${CHROOTDIR}/usr/ports
+		if [ -d "${CHROOTDIR}/usr/ports/.git" ]; then
+			git -C ${CHROOTDIR}/usr/ports pull -q
 		fi
 	fi