From owner-freebsd-git@freebsd.org Sun Feb 7 22:10:56 2021 Return-Path: Delivered-To: freebsd-git@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 E94B953B32D for ; Sun, 7 Feb 2021 22:10:56 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mailman.nyi.freebsd.org (mailman.nyi.freebsd.org [IPv6:2610:1c1:1:606c::50:13]) by mx1.freebsd.org (Postfix) with ESMTP id 4DYjz44QkMz3krl for ; Sun, 7 Feb 2021 22:10:56 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mailman.nyi.freebsd.org (Postfix) id 97CEC53AE6E; Sun, 7 Feb 2021 22:10:56 +0000 (UTC) Delivered-To: git@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 9792353AF45 for ; Sun, 7 Feb 2021 22:10:56 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qv1-xf31.google.com (mail-qv1-xf31.google.com [IPv6:2607:f8b0:4864:20::f31]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DYjz43RNzz3kpp for ; Sun, 7 Feb 2021 22:10:56 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qv1-xf31.google.com with SMTP id p6so160014qvm.12 for ; Sun, 07 Feb 2021 14:10:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=wp57ek/jd+c6X0LkplLSuc6cWdvK3+dBDDrDo/4w7NQ=; b=n1QV7+4AdwuFSuxoYVSGX9qMW36T3Wc3hsKHh5IjM+S060Z9zj8EYbodSMpJvNU6lo NHdnRs2SKRKZ/7N+1KI5PPj10hN6rIVyy071Ynr1UgotMmTX4ProUo+fF66iA1LkpMDV rWUmtev1klb/gcEbI6k2bFXDhEsgPpDGiN05l7qMzSGGNLtCpqNoEtoaBEcUHsuhrUlZ 29FEPE61jWI3wMNm5tqRU1LWekoP3TOpWZias55L22YPGvRPCDozTGa1CvMxB8ef2FNN bXMsOsgNJSUOYje3Q+mF0jLz++4OcBadqoi83NpjZNmXiqE1DK2n9o8Fj2dFhWNT7odX 7r7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=wp57ek/jd+c6X0LkplLSuc6cWdvK3+dBDDrDo/4w7NQ=; b=AiKL2L1h3iVCh/Kh8ygZBXxbSVeBBLQwcL8Uil6FdReX7V9res+EJ6UJSNw5+E+fwH LBURSjKVYElA8Yle1KPULkAhUugbkKFUWywdfm+s1dsUCiiJ/PZCthEfk26G2qPV+vo7 oi6TJAytvYyQYS46zwt1LZUlMbdR0fsuvm9iUo5hR2SS+Eh4TZtFgUui/2v/pAUfRYZo RYyiEekGcwkcXbqEel8yylyE3jMlNRCCUYL+PNSLmL7BnO28bEUuLPCAERtbyKvwSlc/ oNb4FQtKgmMkq70SPE3v6QxTQ+xvTYO1ERFjP2rS3F+QI85iH5NjkWq30+daBSt6ELkc pPKw== X-Gm-Message-State: AOAM533+yS0Y3Yn+MM91QCMZMSHtzVQDVc5NtyqGwZpcKy5e3Ofdzukw WSzPPNf3m6sMOeMYGfN0xH4RlTqBognWWoKUp8yoRux1VEI= X-Google-Smtp-Source: ABdhPJyrg8ROgxxXD7ny+sl5tv02ZG9fMfUsd2rODEAxq7/Doq6jS7c1QkOrMBmKzvdqHza40i9JYIfMtgGhwiKeXhI= X-Received: by 2002:a05:6214:14e2:: with SMTP id k2mr13532871qvw.24.1612735855404; Sun, 07 Feb 2021 14:10:55 -0800 (PST) MIME-Version: 1.0 References: <20210207163437.ffta4ebkndofh4ke@mutt-hbsd> <20210207174648.bzpfkw326agk2s2a@mutt-hbsd> <20210207215913.pvb2jwd7rzi7fkaa@mutt-hbsd> In-Reply-To: <20210207215913.pvb2jwd7rzi7fkaa@mutt-hbsd> From: Warner Losh Date: Sun, 7 Feb 2021 15:10:42 -0700 Message-ID: Subject: Re: HEADS UP: hashes changing for the freebsd-ports repo on Sunday To: Shawn Webb Cc: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= , git@freebsd.org X-Rspamd-Queue-Id: 4DYjz43RNzz3kpp X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.34 X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Feb 2021 22:10:57 -0000 On Sun, Feb 7, 2021, 2:59 PM Shawn Webb wrote: > On Sun, Feb 07, 2021 at 08:48:38PM +0100, Ulrich Sp=C3=B6rlein 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=C3=B6rlein 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=C3=B6rlein wr= ote: > > > > > > On Wed, 2021-02-03 at 13:54:56 +0100, Ulrich Sp=C3=B6rlein wrot= e: > > > > > > > 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 > > > > > > live. > > > > > > > > > > Sorry for what may seem like dumb questions, but I just wanted to > make > > > > > 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) > > > > > > > > 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 th= e > 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 `git > > > > merge`.) > > > > > > > > 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? > > > > 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? > Yes. Given the src experience, it can't be ruled out and is likely. Warner Sorry for the miscommunication. > > Thanks, > > -- > 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/S= hawn_Webb/03A4CBEBB82EA5A67D9F3853FF2E67A277F8E1FA.pub.asc >