From dce2cf311bc12dee4560329f53ccb53470d5793e Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 10 Sep 2021 15:53:32 +0200 Subject: git: 'reference-available?' recognizes 'tag-or-commit'. * guix/git.scm (reference-available?): Handle 'tag-or-commit' with a 40-digit hex string. --- guix/git.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/guix/git.scm b/guix/git.scm index 719af950ad..dc2ca1be84 100644 --- a/guix/git.scm +++ b/guix/git.scm @@ -36,7 +36,7 @@ #:use-module (guix sets) #:use-module ((guix diagnostics) #:select (leave warning)) #:use-module (guix progress) - #:autoload (guix swh) (swh-download) + #:autoload (guix swh) (swh-download commit-id?) #:use-module (rnrs bytevectors) #:use-module (ice-9 format) #:use-module (ice-9 match) @@ -342,7 +342,8 @@ dynamic extent of EXP." "Return true if REF, a reference such as '(commit . \"cabba9e\"), is definitely available in REPOSITORY, false otherwise." (match ref - (('commit . commit) + ((or ('commit . commit) + ('tag-or-commit . (? commit-id? commit))) (let ((len (string-length commit)) (oid (string->oid commit))) (false-if-git-not-found -- cgit 1.4.1