~ruther/guix-local: git: 'update-cached-checkout' recognizes truncated commit IDs.

~ruther/guix-local

26965563ef581553c9dd37192293a75de84176bd — Ludovic Courtès 3 years ago a11522a

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.

patch browse .tar.gz

1 files changed, 2 insertions(+), 1 deletions(-)

M guix/git.scm

M guix/git.scm => guix/git.scm +2 -1

@@ 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