From owner-dev-commits-src-main@freebsd.org Wed May 12 16:06:47 2021 Return-Path: Delivered-To: dev-commits-src-main@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 B61B0644056; Wed, 12 May 2021 16:06:47 +0000 (UTC) (envelope-from gjb@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (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-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "freefall.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FgKRW4nGpz4nP5; Wed, 12 May 2021 16:06:47 +0000 (UTC) (envelope-from gjb@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1620835607; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=iM/6S/XBpIHR3FKh83auetAQd0nHp17ge8Ep90ukPs4=; b=Kjnc9ydulKwJ4FEEW6htLj7eJmft7N1yCx9i+vS3LN48oR7zi2cEJ+U+Y1osHSfXlV5Vbt Q5qVsPvplgyll6of5wb/zZhimnEKEQZBK3MH7NVBq8PmdcK4HdcSmEH25drqNXMpcmeCqW e4y+CfdRNM/+z4cj00VCFzs7yr0QlyjkMWN4Hp2pSPDzgaBek5rh/I7vNQLzdZ+zmcVUOG vrWg9b3IlS3ENPUHQINBGZR4XC031N1bw59adl/b1iGALN9DvqleEE6TgK/dD95CMoKXVh nIr2niOTnh2sDXzsj9gkkc037IeIBBAJfO3xoHv6DBfa+ebu/MjpBJinYAet9w== Received: from FreeBSD.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by freefall.freebsd.org (Postfix) with ESMTPS id 31BF818C07; Wed, 12 May 2021 16:06:47 +0000 (UTC) (envelope-from gjb@freebsd.org) Date: Wed, 12 May 2021 16:06:45 +0000 From: Glen Barber To: Yasuhiro Kimura 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 Message-ID: <20210512160645.GJ92026@FreeBSD.org> References: <202105121448.14CEmfJH042754@gitrepo.freebsd.org> <20210513.010337.560902240722301845.yasu@utahime.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="QFQuXaHm0gDucWbk" Content-Disposition: inline In-Reply-To: <20210513.010337.560902240722301845.yasu@utahime.org> ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1620835607; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=iM/6S/XBpIHR3FKh83auetAQd0nHp17ge8Ep90ukPs4=; b=wJmfwqtzZJaRHh90jewE8Fjzm+gZ9VpHeV9AQvdr/Ov/MRXxnCqYwPIvph1a0M9rxpQAJM ZrG+hQuVPEWSv6brJtC1Ql7jeA5FES4LDrAsImkbaLrggYV3+Sr4EGxfMIawzUif/oe0ua i0yPOK3NsBfmz026KqHMVHkE7MRNy8ELh4mCn6ANP5znPm+P/LXmZvTrZjxnpRo9EJMgKa 8u1cZWxmUbOCI1QYBXmeGVgHPiKrcdlzz4HsfJUxYl9Y63kBRLWU6tC1mpu0lbgRE01qRe Md+1G/biBV4VvzwSJGz9WsdID717oyjuFrHd/MgBkj14Mddj4qbTM/cHla99yw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1620835607; a=rsa-sha256; cv=none; b=iE+2vhOtTM7+rRbhfXN9olLQtdHhDG/s0Ffhq9ogABDK6dOeAuUZUNHD6h8EjPE19F+3U9 9AQkJ635VADipvOnwUlqblb/Kb+LotHkvPWAa1fYG0qbJkkr8x4tKvwZ+GHEPTauEGKVEW osAq3kcani7w1rJGEAt7Mtt4+OIS0KpFGNr4mBNUj63hMvEhdc1KaMJhjhxgJd3Kn27yS0 3TmK2PcmWZp50fvKRL2z8+C45ZmwHzxdHBFtWpRqYAtO3eW7AxKI/8l4db0f2oHasoXXOC o9jvMzwHzD8QJ+yZWb/RBPE0HO0LPjgSU8v9+1OEopllZo+IJKt8Kr06kQvL6w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 May 2021 16:06:47 -0000 --QFQuXaHm0gDucWbk Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, May 13, 2021 at 01:03:37AM +0900, Yasuhiro Kimura wrote: > Hello Glen, >=20 > 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 >=20 > > 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 >=20 > This should be such as following. >=20 > ---------------------------------------------------------------------- > 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 > ---------------------------------------------------------------------- >=20 > Or ports tree isn't checked out when build is from scratch. >=20 Bah, you're right. I fixed it in stable/13 without noticing it was needed here, too. Thanks for spotting this. Glen --QFQuXaHm0gDucWbk Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAmCb/RQACgkQAxRYpUeP 4pN75Q/+Jebv7Kefjt7Q9E+aFj0SHLl8Dt+p2xetVJAyPejm+UEZvrZ4D7kP1A57 fJXgPehfZ6TEYhW0sZIUyMInX+RCmhgcgN6Lhhf/LU9GuHIsLpDjdluv5tOiY4Wr iitAYvmmycvxZBReyQmEHw1tw5IuHvuys6/RxO2rfUXYLz90CgERykqJ6fUCHM54 5D+RHw/Mio3Daa8F+srCxUkXhKmeFWOsBiKxWdNffVGeYxQispuVQjLmtOoveZRN pS6e8hdg7ZSFzaDLfW8/Vx2D7Ek3k5i/xPi/aHB0yBLGH+y5JVRGS3fi52dr1zOl qBRCOdHvwv7Qa9aRM29bBtG/aEzhRF+sskUf2NbT6w7KBGfxopYETNRt90T6Z4qn 73wz8yimmFwkBwfN8IQYOLKNwSuTZEjJN55LnmxLotX5ClyCv2dTWGTqYtqlD+MH 6xgCOXLLHMOHxHW3400vF5zZW1xGGEqL1R5GQeM8w11uj7zQae0I8D3z837erlCT 2VciT6QxDAmgIpbGf8iNSFGalecimYo+3S+io38NtkF+2HCPjs2Wp382vYYvKL9O P4AAAHkSTDfsDPg+J65nARQCvdKYENTMup5PVoEypVXm78Rv+37COZr8GfWNizef ygTgo5Ktl4iYN68XhDQDINSdh0g/tUuBBLdjkDqKOaUfm+gxU3A= =lSKz -----END PGP SIGNATURE----- --QFQuXaHm0gDucWbk--