GNU bug report logs - #78283
guix git authenticate is indiscriminant in which branches it applies to

Previous Next

Full log

View this message in rfc822 format

From: help-debbugs <at> gnu.org (GNU bug Tracking System)
To: Ludovic Courtès <ludo <at> gnu.org>
Cc: tracker <at> debbugs.gnu.org
Subject: bug#78283: closed (guix git authenticate is indiscriminant in
 which branches it applies to)
Date: Mon, 23 Jun 2025 09:47:03 +0000

[Message part 1 (text/plain, inline)]

Your message dated Mon, 23 Jun 2025 11:45:50 +0200
with message-id <8734bq3i5t.fsf <at> gnu.org>
and subject line Re: bug#78283: guix git authenticate is indiscriminant in which branches it applies to
has caused the debbugs.gnu.org bug report #78283,
regarding guix git authenticate is indiscriminant in which branches it applies to
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs <at> gnu.org.)


-- 
78283: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=78283
GNU Bug Tracking System
Contact help-debbugs <at> gnu.org with problems

[Message part 2 (message/rfc822, inline)]

From: Vagrant Cascadian <vagrant <at> debian.org>
To: bug-guix <at> gnu.org
Cc: vagrant <at> debian.org
Subject: guix git authenticate is indiscriminant in which branches it
 applies to
Date: Tue, 06 May 2025 11:31:53 -0700

[Message part 3 (text/plain, inline)]

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

[signature.asc (application/pgp-signature, inline)]

[Message part 5 (message/rfc822, inline)]

From: Ludovic Courtès <ludo <at> gnu.org>
To: Vagrant Cascadian <vagrant <at> debian.org>
Cc: 78283-done <at> debbugs.gnu.org
Subject: Re: bug#78283: guix git authenticate is indiscriminant in which
 branches it applies to
Date: Mon, 23 Jun 2025 11:45:50 +0200

Ludovic Courtès <ludo <at> gnu.org> writes:

> Vagrant Cascadian <vagrant <at> debian.org> 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: <https://codeberg.org/guix/guix/pulls/482>.

Pushed:

  99f85246e19 * git authenticate: Do nothing when invoked from the keyring branch.
  0ec5cab1325 * git authenticate: Gracefully handle passing an annotated tag to ‘--end’.
  56eb949f3b4 * git authenticate: Upgrade pre-push hook with a fixed version.
  55b38ddefca * git authenticate: Remove support for Guile-Git < 0.7.0.

Ludo’.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.