From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id CB8uGaQ+0V5qKwAA0tVLHw (envelope-from ) for ; Fri, 29 May 2020 16:56:04 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id oOJEFaQ+0V7XGQAAB5/wlQ (envelope-from ) for ; Fri, 29 May 2020 16:56:04 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 229F2940B0C for ; Fri, 29 May 2020 16:56:04 +0000 (UTC) Received: from localhost ([::1]:53694 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jeiId-0004T9-3d for larch@yhetil.org; Fri, 29 May 2020 12:56:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36646) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jeiHN-0003Jx-Bv for guix-devel@gnu.org; Fri, 29 May 2020 12:54:45 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:43634) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jeiHN-0002EQ-11 for guix-devel@gnu.org; Fri, 29 May 2020 12:54:45 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=44852 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1jeiHM-0002YI-4j; Fri, 29 May 2020 12:54:44 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Marius Bakke Subject: Re: Heads-up: hard reset of the 'staging' branch References: <87ftbn7r7r.fsf@gnu.org> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 11 Prairial an 228 de la =?utf-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Fri, 29 May 2020 18:54:42 +0200 In-Reply-To: <87ftbn7r7r.fsf@gnu.org> (Marius Bakke's message of "Mon, 25 May 2020 21:24:40 +0200") Message-ID: <87mu5qy94d.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-BeenThere: guix-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: guix-devel@gnu.org Errors-To: guix-devel-bounces+larch=yhetil.org@gnu.org Sender: "Guix-devel" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-devel-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-devel-bounces@gnu.org X-Spam-Score: -1.01 X-TUID: +lJ2RpfG5Vo8 Hi! Marius Bakke skribis: > I have good news and bad news. The good news is that the new commit > verification infrastructure works great. 'make authenticate' will > verify that all commits were signed by a key that was authorized by > .guix-authorizations at that point in time. > > The bad news is that we need to ensure .guix-authorizations has been > updated on any branches that new committers/keys will be pushing to. > Currently the 'staging' branch has one commit > (8229ce3116c1f522c7157ab2dcd50dc2d765686a) signed by a > not-yet-authorized key (it had been authorized on 'master' by > d074f73aacc5a39aed0202d6e45721f53f34a8c0, but that was not yet merged to > 'staging' at the time). > > To fix it properly without leaving a gap where 'make authenticate' will > fail, we actually need to rewrite the history. Luckily git supports > rebasing merges(!), and the merge we need was the next commit on that > branch. To be clear, it wouldn=E2=80=99t just =E2=80=9Cleave a gap=E2=80=9D: all fu= ture commits would also be rejected. The authentication code ensures that each commit is signed by one of the keys authorized in its parent commit(s). (See the latest discussions at .) This is a good opportunity to remind all fellow committers of the latest changes in that area, which are summarized here: https://guix.gnu.org/manual/devel/en/html_node/Commit-Access.html Please take a look. SCARY WARNING: When =E2=80=98guix pull=E2=80=99 runs that authentication code, which I h= ope will be the case in a few weeks, any such mistakes means that users will not be able to pull at all, so we all have to be very cautious. If we do make a mistake, we=E2=80=99ll have to reset the branch to a known-good st= ate, like you did. That said=E2=80=A6 thanks *a lot* for carrying out this rebase, Marius! I= =E2=80=99ve never done a rebase including merge commits before (sounds scary!), and I learned that =E2=80=98git rerere=E2=80=99 is not a typo. Thumbs up! Ludo=E2=80=99.