Ludovic Courtès <[email protected]> writes: > Vagrant Cascadian <[email protected]> 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’.
