tribes/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2026-04-06 21:20:33 +02:00
Code Activity

git authenticate: Gracefully handle passing an annotated tag to ‘--end’.

Browse Source 
Partly fixes <https://issues.guix.gnu.org/74583>.

Previously, passing an annotated tag to ‘--end’, as can happen when
‘guix git authenticate’ is invoked by the pre-push hook when pushing
tags, would lead to an error:

  guix git: error: Git error: the requested type does not match the type in the ODB

* guix/scripts/git/authenticate.scm (ensure-commit-id): New procedure.
(guix-git-authenticate): Use it.
* tests/guix-git-authenticate.sh: Test with $v1_2_0_annotated_tag.

Change-Id: I22e8eb665609522c80c1f0dcb9e77a46c23c0c3c
This commit is contained in:
Ludovic Courtès
2025-06-08 17:41:20 +02:00
parent 56eb949f3b
commit 0ec5cab132
2 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tests/guix-git-authenticate.sh
View File

@@ -1,5 +1,5 @@
# GNU Guix --- Functional package management for GNU
# Copyright © 2020, 2022, 2024 Ludovic Courtès <ludo@gnu.org>
# Copyright © 2020, 2022, 2024-2025 Ludovic Courtès <ludo@gnu.org>
#
# This file is part of GNU Guix.
#
@@ -53,6 +53,13 @@ guix git authenticate \
--cache-key="$cache_key" --stats \
--end="$v1_2_0_commit"
# Likewise, but pass the OID of the annotated tag 'v1.2.0' instead of that of
# the commit--this mimics what the pre-push hook gets when pushing tags.
v1_2_0_annotated_tag="d5b556eef57321d0be89fdb07db447b2db2718ed"
guix git authenticate \
--cache-key="$cache_key" --stats \
--end="$v1_2_0_annotated_tag"
rm "$XDG_CACHE_HOME/guix/authentication/$cache_key"
# Commit and signer of the 'v1.0.0' tag.