Date: Thu, 29 Apr 2021 18:56:00 +0200 From: Stefan Esser <se@freebsd.org> To: Konstantin Belousov <kostikbel@gmail.com>, Michael Gmelin <grembo@freebsd.org> Cc: Cy Schubert <Cy.Schubert@cschubert.com>, src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: a0358e3d5184 - main - Synch index of contrib/bc with what is in workdir after cloning. Message-ID: <db478706-f8b2-aefa-8f73-598afc186396@freebsd.org> In-Reply-To: <YIrdPtWlpm3iqeUQ@kib.kiev.ua> References: <202104291234.13TCYk5K092776@gitrepo.freebsd.org> <202104291353.13TDrIg3026309@slippy.cwsent.com> <20210429162959.16662d66@bsd64.grem.de> <202104291455.13TEtxEg040285@slippy.cwsent.com> <20210429172122.1751663f@bsd64.grem.de> <YIrdPtWlpm3iqeUQ@kib.kiev.ua>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --MGwy98m7YR63CtDEcHtauMVvecsgTjJbw Content-Type: multipart/mixed; boundary="r1hxZgrtIHIFG1nVLcuFDID8uRl3vVEfj"; protected-headers="v1" From: Stefan Esser <se@freebsd.org> To: Konstantin Belousov <kostikbel@gmail.com>, Michael Gmelin <grembo@freebsd.org> Cc: Cy Schubert <Cy.Schubert@cschubert.com>, src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Message-ID: <db478706-f8b2-aefa-8f73-598afc186396@freebsd.org> Subject: Re: git: a0358e3d5184 - main - Synch index of contrib/bc with what is in workdir after cloning. References: <202104291234.13TCYk5K092776@gitrepo.freebsd.org> <202104291353.13TDrIg3026309@slippy.cwsent.com> <20210429162959.16662d66@bsd64.grem.de> <202104291455.13TEtxEg040285@slippy.cwsent.com> <20210429172122.1751663f@bsd64.grem.de> <YIrdPtWlpm3iqeUQ@kib.kiev.ua> In-Reply-To: <YIrdPtWlpm3iqeUQ@kib.kiev.ua> --r1hxZgrtIHIFG1nVLcuFDID8uRl3vVEfj Content-Type: text/plain; charset=windows-1252 Content-Language: en-US Content-Transfer-Encoding: quoted-printable Am 29.04.21 um 18:22 schrieb Konstantin Belousov: > On Thu, Apr 29, 2021 at 05:21:22PM +0200, Michael Gmelin wrote: >> >> On Thu, 29 Apr 2021 07:55:58 -0700 >> Cy Schubert <Cy.Schubert@cschubert.com> wrote: >> >>> In message <20210429162959.16662d66@bsd64.grem.de>, Michael Gmelin >>> writes: >>>> >>>> On Thu, 29 Apr 2021 06:53:18 -0700 >>>> Cy Schubert <Cy.Schubert@cschubert.com> wrote: >>>> =20 >>>>> git restore the files, git rm the files, rm the files, git stash >>>>> push, all don't remove them from the branch following rebase. And >>>>> subsequent rebase to main will fail. main is ok though. >>>>> >>>>> What is it that you did to sync the index? =20 >>>> >>>> Like in the mail thread linked in the git comment, theoretically a >>>> noop: >>>> >>>> git clone https://git@repo.freebsd.org/src.git >>>> cd src >>>> touch contrib/bc/*vcx* >>>> git commit -a >>>> git push >>>> >>>> It's a problem caused by .gitattributes being checked in after the >>>> *vcx* files were checked in (again, see the email thread and "man >>>> 1 gitattributes"). >>>> >>>> If it was for me, I would remove the .gitattributes eol specs, they >>>> shouldn't be necessary for our purposes. =20 Sorry, this was my fault. IIRC I had added the files to the commit with "add *" and thus missed .gitattributes, and I did not know about the effect the delayed commit of that missing file would cause. Maybe the best solution is to revert all the commits and then start over with a single commit that includes .gitattributes. The Windows specific files are not relevant for FreeBSD, but I'd rather perform the vendor import and cherry-pick without too many changes to the upstream version. >>> It's probably growing pains. >>> >>> It appears only one branch, probably not surprisingly my most used >>> branch, was the only one affected. I had planned to MFC to stable/13 and 12 this weekend, but will wait for the issue to be settled in the main branch, now. Regards, STefan --r1hxZgrtIHIFG1nVLcuFDID8uRl3vVEfj-- --MGwy98m7YR63CtDEcHtauMVvecsgTjJbw Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wsB5BAABCAAjFiEEo3HqZZwL7MgrcVMTR+u171r99UQFAmCK5SAFAwAAAAAACgkQR+u171r99USb Vgf+OWC0JmDpMuAzJyVFI3nWBp8JQpI1Or/4Dghet8gLNXinmdBlfgWLkpmOoFXlHExwG7PQlOAh oA9uM1ERZ33GCE2JBiYVhyX4LIEsDqYq8DbC50CkRuogbAZoVvpm1lKJzOChzHXsxd1rkAp7Qs8X +0cdFe4FcmlxOiyIAE8ihkOZPVB/+ur+GL3OBnJTDoP5mV61ejmR2+e+zUryBnP4qSwMKQhcfT0r Yg9gWTgsi9ImHGyknhQaAdIaCs4ayYP1O4RcxbUgcZuVOSqjvltcc+X8X1HIg5B58bt6K5ddiATV 46hsTPqax62Tr09KiaRXIGCLuOZLjjl/di29g96VBg== =au55 -----END PGP SIGNATURE----- --MGwy98m7YR63CtDEcHtauMVvecsgTjJbw--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?db478706-f8b2-aefa-8f73-598afc186396>