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

Previous Next

Package: guix;

Reported by: Vagrant Cascadian <vagrant <at> debian.org>

Date: Tue, 6 May 2025 18:34:02 UTC

Severity: normal

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

Bug is archived. No further changes may be made.

Full log

Message #11 received at 78283 <at> debbugs.gnu.org (full text, mbox):

From: Simon Tournier <zimon.toutoune <at> gmail.com>
To: Vagrant Cascadian <vagrant <at> debian.org>, 78283 <at> debbugs.gnu.org
Cc: vagrant <at> debian.org
Subject: Re: bug#78283: guix git authenticate is indiscriminant in which
 branches it applies to
Date: Mon, 16 Jun 2025 13:22:57 +0200

Hi,

On Tue, 06 May 2025 at 11:31, Vagrant Cascadian <vagrant <at> debian.org> 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
This bug report was last modified 48 days ago.

Previous Next

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