Date: Sun, 7 Feb 2021 16:59:13 -0500 From: Shawn Webb <shawn.webb@hardenedbsd.org> To: Ulrich =?utf-8?B?U3DDtnJsZWlu?= <uqs@freebsd.org> Cc: git@freebsd.org Subject: Re: HEADS UP: hashes changing for the freebsd-ports repo on Sunday Message-ID: <20210207215913.pvb2jwd7rzi7fkaa@mutt-hbsd> In-Reply-To: <YCBEFq1MZPaIif2U@acme.spoerlein.net> References: <YBqdICGeEnwMXW%2BH@acme.spoerlein.net> <YCAUQWmoRpby5EYj@acme.spoerlein.net> <20210207163437.ffta4ebkndofh4ke@mutt-hbsd> <YCAhhl3J0XHxzy2B@acme.spoerlein.net> <20210207174648.bzpfkw326agk2s2a@mutt-hbsd> <YCBEFq1MZPaIif2U@acme.spoerlein.net>
next in thread | previous in thread | raw e-mail | index | archive | help
--i5muybcg5e6jupbt Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Feb 07, 2021 at 08:48:38PM +0100, Ulrich Sp=F6rlein wrote: > On Sun, 2021-02-07 at 12:46:48 -0500, Shawn Webb wrote: > > On Sun, Feb 07, 2021 at 06:21:10PM +0100, Ulrich Sp=F6rlein wrote: > > > On Sun, 2021-02-07 at 11:34:37 -0500, Shawn Webb wrote: > > > > On Sun, Feb 07, 2021 at 05:24:33PM +0100, Ulrich Sp=F6rlein wrote: > > > > > On Wed, 2021-02-03 at 13:54:56 +0100, Ulrich Sp=F6rlein wrote: > > > > > > Hi folks, > > > > > > > > > > > > It's another one of those instances where the hashes will change > > > > > > (starting with all commits from Jan 5th 2021 forward). > > > > > > > > > > > > Our latest ports committers were not added to the authormap fil= e in time > > > > > > _and_ this stopped being a fatal issue in the converter a while= ago :/ > > > > > > > > > > > > Please bear with us a while longer. > > > > > > Thanks > > > > > > Uli > > > > > > > > > > > > PS: This also affects the src and doc repos, but they will obvi= uously > > > > > > not be changed again, see the errata notes at > > > > > > https://github.com/freebsd/git_conv/tree/next > > > > > > > > > > This has now been pushed and the new hashes (and missing authorna= mes!) are > > > > > live. > > > > > > > > Sorry for what may seem like dumb questions, but I just wanted to m= ake > > > > sure: > > > > > > > > 1. For downstream projects that have already switched to > > > > git.freebsd.org for src, do we need to deal with changed hashes > > > > again? (ie, git merge --allow-unrelated-histories) > > >=20 > > > Nothing changed for src. > > >=20 > > > > 2. Do I now need to merge unrelated histories on ports if I use por= ts > > > > from github? > > >=20 > > > Depends a bit. There is shared history, but it forkes off way in the = past, > > > so if you have work on custom branch, it might indeed be easiest to m= erge > > > with --allow-unrelated-histories. > > >=20 > > > (I personally would probably write out the merge commit manually myse= lf, > > > it's much easier than figuring out what sort of flags one needs on th= e `git > > > merge`.) > > >=20 > > > Of course, if you're using rebase-based workflows, this all will be r= ather > > > trivial to rebase. > >=20 > > Thanks for the info! HardenedBSD uses a merge-based workflow since we > > plan to be around a while. Switching to rebased-based would have > > negative consequences to our downstream vendors. > >=20 > > One more question: when ports is officially switched over to git, are > > we likely to see hash more hash changes? >=20 > No, of course not. Once the conversion has been finalized, none of the > history or metadata will be touched retroactively. We'll then have to live > with errors basically forever. I worded that horrifically wrong. I blame the lack of caffeine. ;) I meant to ask: is there any possibility that the hashes will change again before the official switch to git? Sorry for the miscommunication. Thanks, --=20 Shawn Webb Cofounder / Security Engineer HardenedBSD GPG Key ID: 0xFF2E67A277F8E1FA GPG Key Fingerprint: D206 BB45 15E0 9C49 0CF9 3633 C85B 0AF8 AB23 0FB2 https://git-01.md.hardenedbsd.org/HardenedBSD/pubkeys/src/branch/master/Sha= wn_Webb/03A4CBEBB82EA5A67D9F3853FF2E67A277F8E1FA.pub.asc --i5muybcg5e6jupbt Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEA6TL67gupaZ9nzhT/y5nonf44foFAmAgYq4ACgkQ/y5nonf4 4fr2XhAAk9ZtWenxcjbgHFYnMr/Kr8VqZmUJ4Zq0y2qGheWfty8/cLI37URIiciW UnTvv5db+cJnWfAAXS4KAtry7TrI73jYnvNK2rNGLqBVtleTOKS0wjN1IYXD3sSV eTUjryANIfblrPnNYqDdfet6ZzQFeh9kW3oeeDR93hh3ARJbifdq8kbV7/IgeQEz CoYQ51bIACsSdDIpDDJNNNYZxbTD/ielGx25iKY3NXnB0gAvzHH21cQ7AixKsimR tp5sSFf6Ak4Zjw7EP5XIC7t7mzeRaBgZOoazz/FxG1+ivzf5oYzdEGAJJlgbpzFD pPyuVBNdDyORfNu8MdprV5nCXqkIzmqAf9HbVncXTNL65geDmPbF4snTKxdymP04 4MPtelN2PENNxXjBWIgatoHI0i+XXqR6BM3A30zS1ofMwiWqI3Bmzmp2BbZbiLa3 6R/2M6TdppzgXkNcU/6EXBSU7sv0SIctaJRpNd1ngAb1VB1oFM362HMJkJJaJJSN z3h7N4bCU//zvAp7LMBPBXjz2bnEEcXuL/SCZNaMzt3fIW/SWrWlUzHApG0E+9/i POgqYViVWLJZd4YzX5TMwHS629sozD9mBhoDkN1sYJNK+aMS8hNEFIkoQDZaK+W2 1jU9l6ncw8ZoVz5VN7bF7Vkj/gFl4V2iBXRa3oYgPk6rujz4YRQ= =g96B -----END PGP SIGNATURE----- --i5muybcg5e6jupbt--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20210207215913.pvb2jwd7rzi7fkaa>