Date: Wed, 12 May 2021 16:10:48 +0000 From: Glen Barber <gjb@freebsd.org> To: Yasuhiro Kimura <yasu@utahime.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 Message-ID: <20210512161048.GK92026@FreeBSD.org> In-Reply-To: <20210512160645.GJ92026@FreeBSD.org> References: <202105121448.14CEmfJH042754@gitrepo.freebsd.org> <20210513.010337.560902240722301845.yasu@utahime.org> <20210512160645.GJ92026@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --]
On Wed, May 12, 2021 at 04:06:45PM +0000, Glen Barber wrote:
> On Thu, May 13, 2021 at 01:03:37AM +0900, Yasuhiro Kimura wrote:
> > Hello Glen,
> >
> > From: Glen Barber <gjb@FreeBSD.org>
> > 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.
> >
>
> Bah, you're right. I fixed it in stable/13 without noticing it was
> needed here, too.
>
> Thanks for spotting this.
>
Oops. It turns out I did not fix this in stable/13. I pushed an update
there, too.
Glen
[-- Attachment #2 --]
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAmCb/ggACgkQAxRYpUeP
4pOopg//exr/7nEUuIMBv3rUEn97TCTRwi6Bl3bRFo2249u/AfZDSiQnCNcCN7pL
CpVJo05vOGZVO96jNudq1pxrJqoolevep0wnrz898M73IgiVfoktuhU8i+dqfKHZ
imXaDDlt5sDfi0BNbraXZ7OEUFtI2LklwIiilHQYiC5oA4+nbfFKJDnmnZLbEv4T
u7CXZ8Fi1E7TR/tZx7lSzXxsclUcAfUi1y90kJL0S7+yYTAKcd16PD95N6NE2SQG
8oh1p642DNuXuqxqLXnfD4gcs8x6BNraPT4GhJIoG/SX9iyWesnGJBish6iopbXV
8Pjujg58EEwH0dOjDrgA3nroXBcLoydYf7JbkI7xcIFNxH5UFBTiECmv295RKNQW
g90zeGswCDz/2P/7Vc8mVPER1Ndjdcn1skBEMu6dYD2bFpOJPC69SfndKEarTCdP
PcDd+PJmICG2Nleg1fpBfZG/vawIXIZjA5ljpktS1WjgVUN13R7/vMauH0n0MgLU
EIrum5FR2z0kA9w2eNls+g5cLqgN5L419D9xnkjJ2rpLVgKQNhs0Ih/0hLLRwVut
uL7MQ4pxC1ObeLVjYSYWNfgCbLivEGt9jTisiMZGA+d0vlCuoosetjc7nbwncapP
+nM7GdJtj7kZ9ji4RV8+pzYRlGI5yLp8MIORr2i1iuFfZWeXwpQ=
=iLd8
-----END PGP SIGNATURE-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20210512161048.GK92026>