svn commit: r364960 - head/release

[Glen Barber]

Author: gjb
Date: Sat Aug 29 16:04:02 2020
New Revision: 364960
URL: https://svnweb.freebsd.org/changeset/base/364960

Log:
  Refine the VCSUPDATE logic further:
  - Look for the .git directory instead of top-level directory.
  - Use 'git -C' instead of cd(1).
  
  Sponsored by:	Rubicon Communications, LLC (netgate.com)

Modified:
  head/release/release.sh

Modified: head/release/release.sh
==============================================================================
--- head/release/release.sh	Sat Aug 29 15:50:27 2020	(r364959)
+++ head/release/release.sh	Sat Aug 29 16:04:02 2020	(r364960)
@@ -221,22 +221,22 @@ chroot_setup() {
 	mkdir -p ${CHROOTDIR}/usr
 
 	if [ -z "${SRC_UPDATE_SKIP}" ]; then
-		if [ -d "${CHROOTDIR}/usr/src" ]; then
-			cd ${CHROOTDIR}/usr/src && ${VCSUPDATE} && cd -
+		if [ -d "${CHROOTDIR}/usr/src/.git" ]; then
+			${VCSUPDATE} -C ${CHROOTDIR}/usr/src
 		else
 			${VCSCMD} ${SRC} -b ${SRCBRANCH} ${CHROOTDIR}/usr/src
 		fi
 	fi
 	if [ -z "${NODOC}" ] && [ -z "${DOC_UPDATE_SKIP}" ]; then
-		if [ -d "${CHROOTDIR}/usr/doc" ]; then
-			cd ${CHROOTDIR}/usr/doc && ${VCSUPDATE} && cd -
+		if [ -d "${CHROOTDIR}/usr/doc/.git" ]; then
+			${VCSUPDATE} -C ${CHROOTDIR}/usr/doc
 		else
 			${VCSCMD} ${DOC} -b ${DOCBRANCH} ${CHROOTDIR}/usr/doc
 		fi
 	fi
 	if [ -z "${NOPORTS}" ] && [ -z "${PORTS_UPDATE_SKIP}" ]; then
-		if [ -d "${CHROOTDIR}/usr/ports" ]; then
-			cd ${CHROOTDIR}/usr/ports && ${VCSUPDATE} && cd -
+		if [ -d "${CHROOTDIR}/usr/ports/.git" ]; then
+			${VCSUPDATE} -C ${CHROOTDIR}/usr/ports
 		else
 			${VCSCMD} ${PORT} -b ${PORTBRANCH} ${CHROOTDIR}/usr/ports
 		fi