Date: Wed, 12 May 2021 15:57:10 GMT From: Glen Barber <gjb@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 929bf5b637c3 - stable/13 - release: follow-up to previous commit to use Git for the ports tree Message-ID: <202105121557.14CFvA9e037053@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by gjb: URL: https://cgit.FreeBSD.org/src/commit/?id=929bf5b637c3cfdfdabdd2fbf95e786fd7e64141 commit 929bf5b637c3cfdfdabdd2fbf95e786fd7e64141 Author: Glen Barber <gjb@FreeBSD.org> AuthorDate: 2021-05-12 14:29:53 +0000 Commit: Glen Barber <gjb@FreeBSD.org> CommitDate: 2021-05-12 15:52:23 +0000 release: follow-up to previous commit to use Git for the ports tree Approved by: re (delphij, insta-MFC) Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit fb6e261c20ebcd94875d623e167369802721f2dd) --- 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202105121557.14CFvA9e037053>