From unknown Mon Jun 16 23:54:25 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#78283 <78283@debbugs.gnu.org> To: bug#78283 <78283@debbugs.gnu.org> Subject: Status: guix git authenticate is indiscriminant in which branches it applies to Reply-To: bug#78283 <78283@debbugs.gnu.org> Date: Tue, 17 Jun 2025 06:54:25 +0000 retitle 78283 guix git authenticate is indiscriminant in which branches it = applies to reassign 78283 guix submitter 78283 Vagrant Cascadian severity 78283 normal thanks From debbugs-submit-bounces@debbugs.gnu.org Tue May 06 14:33:09 2025 Received: (at submit) by debbugs.gnu.org; 6 May 2025 18:33:09 +0000 Received: from localhost ([127.0.0.1]:33053 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uCN6L-0001RY-G7 for submit@debbugs.gnu.org; Tue, 06 May 2025 14:33:09 -0400 Received: from lists.gnu.org ([2001:470:142::17]:36690) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uCN6J-0001Q4-DC for submit@debbugs.gnu.org; Tue, 06 May 2025 14:33:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uCN5d-0006RD-Mz for bug-guix@gnu.org; Tue, 06 May 2025 14:32:26 -0400 Received: from cascadia.aikidev.net ([2600:3c01:e000:267:0:a171:de7:c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uCN5b-0008Rz-4K for bug-guix@gnu.org; Tue, 06 May 2025 14:32:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=debian.org; s=1.vagrant.user; t=1746556336; bh=PIKTSL+UcXPf5HnVPNIB8RWUQay7uVBw4kWH+18BUdI=; h=From:To:Cc:Subject:Date:From; b=RVwvpr7VKSUTL7CCuFq1+EAHXlG/aAf8eRAvdkhPCaF7WYT79jSEfpg8OYWAW2kcV A6XcPultrhSJdA2CLT9UF4/Sj19KW8xcRUpNafpr251mOOqhhTbhR3DjDVnuC5cKQU JcpBvqN3knGcxo6eD+ySwPuw0/8EB4jwJ8+SP7xZmU3/ARSU+J8YSHa/4fhuZJ+pl5 dc3e2qCpgckb2tuw+XNcgC9mgPwppS6Kn0Y6uU9lejSFU/bbg0F8i5jfLwVlvqwLrr yQseXRkhRalvrhdsjav68bxt2YC0+1loM3r7KKCknhLgnFXRif1GgPDdcdu/5+wdzO a8AWVJBWRZYbw== Received: from localhost (unknown [IPv6:2600:3c01:e000:21:7:77:0:50]) by cascadia.aikidev.net (Postfix) with ESMTPSA id A921082E3; Tue, 6 May 2025 11:32:16 -0700 (PDT) From: Vagrant Cascadian To: bug-guix@gnu.org Subject: guix git authenticate is indiscriminant in which branches it applies to Date: Tue, 06 May 2025 11:31:53 -0700 Message-ID: <87bjs5r3om.fsf@wireframe> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Received-SPF: none client-ip=2600:3c01:e000:267:0:a171:de7:c; envelope-from=vagrant@debian.org; helo=cascadia.aikidev.net X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.414, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, HEXHASH_WORD=1, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: submit Cc: vagrant@debian.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain So, when I update my local keyring branch with new merges, guix git authenticate issues a non-fatal error: $ git checkout keyring Switched to branch 'keyring' $ git reset --hard 21173006e4165d8990b75ca46c78d83448d2e45a HEAD is now at 21173006e4 Add key for Greg Hogan. $ git merge --ff-only origin/keyring Updating 21173006e4..0869e2220d Fast-forward futurile-89CA9B07.key | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 futurile-89CA9B07.key Authenticating commits 5010a51 to 0869e22 (31 new commits)... guix git: error: commit 0869e2220d611d7202de64dba4fa81207522a4f9 is not a descendant of introductory commit 5010a51f91aeac5a3b87a3eea04f18f3fe8a3a3 Which is a bit alarming! .git/config contains: [guix "authentication"] introduction-commit = 5010a51fc91aeac5a3b87a3eea04f18f3fe8a3a3 introduction-signer = 1A858392E331EAFDB8C27FFBF3C1A0D9C1D65273 keyring = keyring Looks like something also created .git/hooks/post-merge: #!/bin/sh # Authenticate the repo upon 'git pull' and similar. exec guix git authenticate On the one hand, I get why it magically appeared probably when I initially ran "guix git authenticate", but on the other, it is surprising behavior as I do not recall asking for it. :) live well, vagrant --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEARYKAB0WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCaBpVmQAKCRDcUY/If5cW qluxAQDjSHHc9bfgzGvlQUwNOjchjf99MGIhqvacU2TgX3LujQEAvcXgyBdCfKrt RcBF3GdsvKkKfWhI0KREeqdUlZk5FQs= =+e4W -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sun Jun 08 14:12:34 2025 Received: (at 78283) by debbugs.gnu.org; 8 Jun 2025 18:12:34 +0000 Received: from localhost ([127.0.0.1]:52856 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uOKVV-0003wH-Vx for submit@debbugs.gnu.org; Sun, 08 Jun 2025 14:12:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41586) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uOKVT-0003vu-Oy for 78283@debbugs.gnu.org; Sun, 08 Jun 2025 14:12:32 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uOKVM-00083G-KK; Sun, 08 Jun 2025 14:12:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=0CT9p2IjJMzL51dqxAHp2wYLLNNZMJ/sXGijLs/9pwU=; b=KSWOGKfhumwaCJttfUfg 3oJT8hK9capE1CnNgB3bIFj9YYO8Z0TjCZ5UdbqWHLrc29YZxCHycIFGj3AWyYw6bDticm0RIDBQs 4o4HTLYamgVxK4Kk5ol+o6iEruGXuqHUNgmfkjoxh8mYb4FX4N3hJPDZXiox/gua4qO6kN+ihpdqc 0H2wuunKDnXyG6dFs32YQHGmpv42POw9ZyjfosUENN7BqG44TME/F6ZJrKTb6yNpDyIgj4cFrT8V4 kBT48J3lj13ijgijmWKWjR2eMF3WnL7OT9sFq0TmlMrsiozIgeYqpCFU89DmCevrukO3sPcSmH4xb mrALAtEOZRfgQQ==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Vagrant Cascadian Subject: Re: bug#78283: guix git authenticate is indiscriminant in which branches it applies to In-Reply-To: <87bjs5r3om.fsf@wireframe> (Vagrant Cascadian's message of "Tue, 06 May 2025 11:31:53 -0700") References: <87bjs5r3om.fsf@wireframe> Date: Sun, 08 Jun 2025 20:11:37 +0200 Message-ID: <87wm9maysm.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 78283 Cc: 78283@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hello, Vagrant Cascadian writes: > So, when I update my local keyring branch with new merges, guix git > authenticate issues a non-fatal error: > > $ git checkout keyring > Switched to branch 'keyring' > $ git reset --hard 21173006e4165d8990b75ca46c78d83448d2e45a > HEAD is now at 21173006e4 Add key for Greg Hogan. > $ git merge --ff-only origin/keyring > Updating 21173006e4..0869e2220d > Fast-forward > futurile-89CA9B07.key | 23 +++++++++++++++++++++++ > 1 file changed, 23 insertions(+) > create mode 100644 futurile-89CA9B07.key > Authenticating commits 5010a51 to 0869e22 (31 new commits)... > guix git: error: commit 0869e2220d611d7202de64dba4fa81207522a4f9 is not= a descendant of introductory commit 5010a51f91aeac5a3b87a3eea04f18f3fe8a3a3 Proposed fix: . Feedback welcome! Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Mon Jun 16 07:50:42 2025 Received: (at 78283) by debbugs.gnu.org; 16 Jun 2025 11:50:42 +0000 Received: from localhost ([127.0.0.1]:43665 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uR8ML-0008OY-Qh for submit@debbugs.gnu.org; Mon, 16 Jun 2025 07:50:42 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]:44351) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1uR8La-0008AN-0O for 78283@debbugs.gnu.org; Mon, 16 Jun 2025 07:49:55 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-451d41e1ad1so38021085e9.1 for <78283@debbugs.gnu.org>; Mon, 16 Jun 2025 04:49:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1750074587; x=1750679387; darn=debbugs.gnu.org; h=mime-version:message-id:date:references:in-reply-to:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=I15xKO6iGyQnj18KjEDfcU9fd4RRsdqcZQqMzWGy0l8=; b=g1FA1WpLy7QBrldCgvzd2pL5waoRDFMKN+rdqLI+POo8z7pbreB/RqN2Nz9UjIEfSI 1uPcxEn0Mu1jFUQpVZYYnKkImPYQLyxKMPsoNf9oosbTVNrRg7w7DLHlYlBc/ktDx9KO 1/iOjoHZippkSZN02SX6baSm54cBxlKw4pxJkjReRfjsz0udYTsUALg+TCLNz7uLfFDU 6RYUSfdkS7ZKCYiIV/nRc7BUtnTRmQ2o3rdJ5bcSBa6zI9ew1VlfWjMBx17O2t0oewVs alonQ0Qs4DPh3NG4/MO6E7oSU39uGsP+nQu4u378z980b8Cx7f4hvzzy8s/dqT4QiC+y k9oA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750074587; x=1750679387; h=mime-version:message-id:date:references:in-reply-to:subject:cc:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=I15xKO6iGyQnj18KjEDfcU9fd4RRsdqcZQqMzWGy0l8=; b=bgx+O0C1/7X/IxuItddIzYuY0/r+bxB2BO7YSn1pxk+uPGuu13h+yAxnx3IDSXlgvr ojTrWhNWmLGUvqj20bY2jlikWnvVm15+Dy7bvO2ITp7kLTUBhbb4vE8SuEdL17FDyryx IQbI71Pkwad4gwWRqeo5o7U/+bQYtjnuMHfQlcQ7ChrKNelh52hDrzk5h845qkJ+xFb8 qPREwTkFcQBsQ/84FQylDZlRFXDj7ylNvmurwzfjRm/5qMCOGQAIxxiFXCP6VxN55xIg EOQW5yDefaDn+/X8U9e0efPw9NDGvvtOG6kzdQYHxRl0R6POaAI8bGqeTpi5d1Fqfoaz qt5g== X-Forwarded-Encrypted: i=1; AJvYcCXtScONdpJTVD20BvF1fe4p2WU6/AK2X+k3JtnxX9BClGFkE1QfWS8mKby3QKNLVMuI1PvTPA==@debbugs.gnu.org X-Gm-Message-State: AOJu0Yz4FbeDjwwsCHJbRG7rYguR0sEg0qqqc2/Tji7zzkB1F+bLhRhL 3kugopejN1zN4E4CG+SfCTeggvDYRcfx0ViLMqjJ6N1x0pnscUStfFGB X-Gm-Gg: ASbGncsG5kGhE0C5UxQ7Nf04KpOpkPRVgtawCBINeG3m30Cnvo7paTXm/ztycZEnQOP TpYkwDlQ+p6kazzFaYp+o6szDm5XWCeX3yBNTbwgYBm0v9UosD5CaV4BJOnSlw195BCuFNbiRsb 8/64JnMURAOcR1BQNeRVKUfbViQiWo4p3OgSs8RqpJnrZBIltAHNqQOnH3OkmwvvyWMP1dO/nPj KtynAEc17uOz5g3gAe41RubAAE3UIw9VwIEcWlOFmrFzPwSdRHIjQBWMyx9PZOc5YL2De//wuwG Kf/mzOjfOA3mwnyO0qd5iJURkxxTBmhinuvIkw960NU/PLqYJbnksMnWNLRLh7EFCDKRtRCD9sp bPevrveYCHpAuQbP2WQr1g1wVL1gbtvdD6g== X-Google-Smtp-Source: AGHT+IEXYG+sQ7vv2coxYa9diOiCg4RrMwcH4uw/JqB9znKdN+I9cE1ON9kY3cJs7H/2ApTzqMlQeg== X-Received: by 2002:a05:600c:540e:b0:450:d00d:cc with SMTP id 5b1f17b1804b1-4533ca40f80mr73561265e9.2.1750074587232; Mon, 16 Jun 2025 04:49:47 -0700 (PDT) Received: from lili (nat-dsi-209.net.univ-paris-diderot.fr. [81.194.30.209]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4531ff595b7sm128477115e9.2.2025.06.16.04.49.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Jun 2025 04:49:46 -0700 (PDT) From: Simon Tournier To: Vagrant Cascadian , 78283@debbugs.gnu.org Subject: Re: bug#78283: guix git authenticate is indiscriminant in which branches it applies to In-Reply-To: <87bjs5r3om.fsf@wireframe> References: <87bjs5r3om.fsf@wireframe> Date: Mon, 16 Jun 2025 13:22:57 +0200 Message-ID: <87bjqo6icu.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 78283 Cc: vagrant@debian.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, On Tue, 06 May 2025 at 11:31, Vagrant Cascadian wrote: > So, when I update my local keyring branch with new merges, guix git > authenticate issues a non-fatal error: > > $ git checkout keyring > Switched to branch 'keyring' > $ git reset --hard 21173006e4165d8990b75ca46c78d83448d2e45a > HEAD is now at 21173006e4 Add key for Greg Hogan. > $ git merge --ff-only origin/keyring Well, although it does not fix the unexpected behaviour you report, here is a proposal to avoid this manual dance: https://codeberg.org/guix/guix/pulls/440#issuecomment-5020854 In other words, if .git/config would contain: [guix "authentication"] introduction-commit = 5010a51fc91aeac5a3b87a3eea04f18f3fe8a3a3 introduction-signer = 1A858392E331EAFDB8C27FFBF3C1A0D9C1D65273 keyring = origin/keyring Cheers, simon