Date: Sun, 7 Feb 2021 12:46:48 -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: <20210207174648.bzpfkw326agk2s2a@mutt-hbsd> In-Reply-To: <YCAhhl3J0XHxzy2B@acme.spoerlein.net> References: <YBqdICGeEnwMXW%2BH@acme.spoerlein.net> <YCAUQWmoRpby5EYj@acme.spoerlein.net> <20210207163437.ffta4ebkndofh4ke@mutt-hbsd> <YCAhhl3J0XHxzy2B@acme.spoerlein.net>
next in thread | previous in thread | raw e-mail | index | archive | help
--c3njv3jvm45nlvrf Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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 file 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 obviuous= ly > > > > not be changed again, see the errata notes at > > > > https://github.com/freebsd/git_conv/tree/next > > >=20 > > > This has now been pushed and the new hashes (and missing authornames!= ) are > > > live. > >=20 > > Sorry for what may seem like dumb questions, but I just wanted to make > > sure: > >=20 > > 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 ports > > 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 merge > with --allow-unrelated-histories. >=20 > (I personally would probably write out the merge commit manually myself, > it's much easier than figuring out what sort of flags one needs on the `g= it > merge`.) >=20 > Of course, if you're using rebase-based workflows, this all will be rather > trivial to rebase. 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. One more question: when ports is officially switched over to git, are we likely to see hash more hash changes? 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 --c3njv3jvm45nlvrf Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEA6TL67gupaZ9nzhT/y5nonf44foFAmAgJ4IACgkQ/y5nonf4 4fpYPg//UEa/vwb6IZ39E9B1tfSPzWUCetnDKXcCYj32AhRnVU/SiMNzpAACruym 1oAt17AlrB1q7cvIdJsSDiugvZaklgW/b6hUEl8yRaS4i/Gqgy1xuSy3HWCv2+F/ VgGhYnVlMjatYPmZVZEgHnBIAc46y2ewvANxxKhyopWostXkPo+75ffyAXD2WJgT vAXXtmqYKLtAKzUQQdpfvk6SRjXDJxevCe5+M/Ko4ydy06aqMD0DrKtwRlpxYLT7 5JxMFfWVPC3QZAcOLo65n3suucj9Sa5O5utJptMN8DOk+JDvHP2avNDVsTjiaZWA Ehc4tEo0Ft+YX1MKKtyj0kB4Y/5F5/qHbB2M4nAfmraGWH+CcUzya2fweV7UMDUw 5HELYsN5G9nRsDroqOhcm42h5MOzXXiToloLA1zygwBdK+e+UAL/6WdETSwbU0OH eAmV1ceUjEisJvTlfAjYkvPEMch1H1FFeCy/0JNXVHpIEhrUTM+SMlQgdGOsXWsH lQJ1O0NtjXn9hp+o6y6nGAk4xVTLKnx/99+7N5Aby1ZdoQ8FRl+fqPf+wGC7NZ90 wzyDOAnSGiGiVGqJ2Z4R2J8n7piEMTWTIVMPOkIfqBCyqQ6/aXyvBwCbAn0HJtrM yMEhH5JMRp1c0l/sZZHEft+cXoNN6sQ1+glDVgeYTUj/hyg3o8k= =a9xy -----END PGP SIGNATURE----- --c3njv3jvm45nlvrf--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20210207174648.bzpfkw326agk2s2a>