git: 'update-cached-checkout' recognizes truncated commit IDs.

Fixes a regression introduced in 602527ab9778165ca9a8f9cb62036038b5354688 that broke 'tests/guix-build-branch.sh'. * guix/git.scm (resolve-reference): Revert change from 602527ab9778165ca9a8f9cb62036038b5354688.
2022-10-14 23:50:49 +02:00 · 2022-10-14 23:50:49 +02:00 · 26965563ef
commit 26965563ef
parent a11522a024
1 changed files with 2 additions and 1 deletions
--- a/guix/git.scm
+++ b/guix/git.scm
@ -261,7 +261,8 @@ corresponding Git object."
                          #f))
                     (_ #f)))
              => (lambda (commit) (resolve `(commit . ,commit))))
-             ((not (commit-id? str))
+             ((or (> (string-length str) 40)
+                  (not (string-every char-set:hex-digit str)))
              (resolve `(tag . ,str)))      ;definitely a tag
             (else
              (catch 'git-error