Date: Sat, 29 Aug 2020 21:42:59 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r364966 - head/release Message-ID: <202008292142.07TLgxE1053200@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gjb Date: Sat Aug 29 21:42:59 2020 New Revision: 364966 URL: https://svnweb.freebsd.org/changeset/base/364966 Log: 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) Modified: head/release/release.sh Modified: head/release/release.sh ============================================================================== --- head/release/release.sh Sat Aug 29 21:05:43 2020 (r364965) +++ head/release/release.sh Sat Aug 29 21:42:59 2020 (r364966) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202008292142.07TLgxE1053200>