From owner-dev-commits-src-main@freebsd.org Thu Apr 29 16:56:04 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 F3034630C26; Thu, 29 Apr 2021 16:56:04 +0000 (UTC) (envelope-from se@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FWM8N6CkPz4rm3; Thu, 29 Apr 2021 16:56:04 +0000 (UTC) (envelope-from se@freebsd.org) Received: from Stefans-MBP-449.fritz.box (p200300cd5f1fe900f013fb8dd2403568.dip0.t-ipconnect.de [IPv6:2003:cd:5f1f:e900:f013:fb8d:d240:3568]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: se/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id EF765C3B1; Thu, 29 Apr 2021 16:56:03 +0000 (UTC) (envelope-from se@freebsd.org) To: Konstantin Belousov , Michael Gmelin Cc: Cy Schubert , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org 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> From: Stefan Esser Subject: Re: git: a0358e3d5184 - main - Synch index of contrib/bc with what is in workdir after cloning. Message-ID: Date: Thu, 29 Apr 2021 18:56:00 +0200 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:78.0) Gecko/20100101 Thunderbird/78.10.0 MIME-Version: 1.0 In-Reply-To: Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="MGwy98m7YR63CtDEcHtauMVvecsgTjJbw" 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: Thu, 29 Apr 2021 16:56:05 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --MGwy98m7YR63CtDEcHtauMVvecsgTjJbw Content-Type: multipart/mixed; boundary="r1hxZgrtIHIFG1nVLcuFDID8uRl3vVEfj"; protected-headers="v1" From: Stefan Esser To: Konstantin Belousov , Michael Gmelin Cc: Cy Schubert , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Message-ID: 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> In-Reply-To: --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 wrote: >> >>> In message <20210429162959.16662d66@bsd64.grem.de>, Michael Gmelin >>> writes: >>>> >>>> On Thu, 29 Apr 2021 06:53:18 -0700 >>>> Cy Schubert 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--