From cde3a69a3769cbe8351ecf31179442481189194f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 4 Dec 2020 18:43:04 +0100 Subject: [PATCH] git: 'reference-available?' handles short commit IDs. Reported by Simon Tournier on #guix. Until now 'reference-available?' would always return #f when passed a short commit ID. * guix/git.scm (reference-available?): Call 'object-lookup-prefix' when COMMIT is shorter than 40 characters. --- guix/git.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/guix/git.scm b/guix/git.scm index 364b4997ae..ca77b9f54b 100644 --- a/guix/git.scm +++ b/guix/git.scm @@ -309,8 +309,12 @@ dynamic extent of EXP." definitely available in REPOSITORY, false otherwise." (match ref (('commit . commit) - (false-if-git-not-found - (->bool (commit-lookup repository (string->oid commit))))) + (let ((len (string-length commit)) + (oid (string->oid commit))) + (false-if-git-not-found + (->bool (if (< len 40) + (object-lookup-prefix repository oid len OBJ-COMMIT) + (commit-lookup repository oid)))))) (_ #f)))