HEADS UP: hashes changing for the freebsd-ports repo on Sunday
uqs at freebsd.org
Sun Feb 7 17:21:12 UTC 2021
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örlein wrote:
>> On Wed, 2021-02-03 at 13:54:56 +0100, Ulrich Spörlein 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 obviuously
>> > 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 authornames!) are
>Sorry for what may seem like dumb questions, but I just wanted to make
>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)
Nothing changed for src.
>2. Do I now need to merge unrelated histories on ports if I use ports
> from github?
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.
(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
Of course, if you're using rebase-based workflows, this all will be
rather trivial to rebase.
More information about the freebsd-git