From owner-dev-commits-src-all@freebsd.org Wed May 12 16:04:31 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 981C2643F55; Wed, 12 May 2021 16:04:31 +0000 (UTC) (envelope-from yasu@utahime.org) Received: from maybe.home.utahime.org (gate.home.utahime.org [183.180.29.210]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4FgKNv26q7z4nFd; Wed, 12 May 2021 16:04:30 +0000 (UTC) (envelope-from yasu@utahime.org) Received: from eastasia.home.utahime.org (eastasia.home.utahime.org [192.168.174.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by maybe.home.utahime.org (Postfix) with ESMTPS id 068D72EAED; Thu, 13 May 2021 01:04:26 +0900 (JST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=utahime.org; s=maybe2019112701; t=1620835466; bh=jI0h5E0Jpa44AqE+3T43HONXHiHdnyKK4DGFlkdII4Y=; h=Date:To:Cc:Subject:From:In-Reply-To:References; b=u1Eke5sJ6KXxHXCNuodx8BDzVaP6Zn7GtVX+vbsSYAz4qpLDIX/BoCv3zFEw3Nu5n 0a4LxWWZvXsB2BBB6oxzMrNVGTpSxhVASHwEtfcFJ8hgF9PgInCMQvnIDNxpqRDiqF wl8El7T8tytH/x9Djzx0uWlbJ66awqJjy+/dr+NnJQgtm6KK/rkmxBoJNWOXr4uQii 4NFfOy3X0dC7B8wflpah0ATP3taV3WPG920rL0zITuDymPhJq32eOgmRz2Ik51fX7v WksKbbZdVPIl4QaGDXs0hWUMTh80nMh+htIp15iF7FAyPjQHsoDGVVUIjBu18/AnWG onaV9KJc9V6UA== Received: from localhost (rolling.home.utahime.org [192.168.174.11]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by eastasia.home.utahime.org (Postfix) with ESMTPSA id F13C43B410; Thu, 13 May 2021 01:04:24 +0900 (JST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.2 at eastasia.home.utahime.org Date: Thu, 13 May 2021 01:03:37 +0900 (JST) Message-Id: <20210513.010337.560902240722301845.yasu@utahime.org> To: gjb@FreeBSD.org Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: fb6e261c20eb - main - release: follow-up to previous commit to use Git for the ports tree From: Yasuhiro Kimura In-Reply-To: <202105121448.14CEmfJH042754@gitrepo.freebsd.org> References: <202105121448.14CEmfJH042754@gitrepo.freebsd.org> X-Mailer: Mew version 6.8 on Emacs 27.2 Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4FgKNv26q7z4nFd X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 May 2021 16:04:31 -0000 Hello Glen, From: Glen Barber Subject: git: fb6e261c20eb - main - release: follow-up to previous commit to use Git for the ports tree Date: Wed, 12 May 2021 14:48:41 GMT > 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 This should be such as following. ---------------------------------------------------------------------- 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 + else + ${VCSCMD} ${PORT} -b ${PORTBRANCH} ${CHROOTDIR}/usr/ports fi fi ---------------------------------------------------------------------- Or ports tree isn't checked out when build is from scratch. --- Yasuhiro Kimura