diff options
author | Ludovic Courtès <ludo@gnu.org> | 2024-03-31 23:17:29 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2024-04-15 22:36:41 +0200 |
commit | 088e181c0a58bf1a03e3aa7be1202fb3cd209136 (patch) | |
tree | 81358e01f07abf103e7a5692ca4c24fedc831f8d | |
parent | a57518484e5437b29496e1c132c6566e1eb437e8 (diff) | |
download | guix-088e181c0a58bf1a03e3aa7be1202fb3cd209136.tar.gz guix-088e181c0a58bf1a03e3aa7be1202fb3cd209136.zip |
channels: Move ‘commit-short-id’ to (guix git).
* guix/channels.scm (commit-short-id): Move to…
* guix/git.scm (commit-short-id): … here.
Change-Id: If4b34b1d82b1aa5068d157f26e57e8aecc967061
-rw-r--r-- | guix/channels.scm | 4 | ||||
-rw-r--r-- | guix/git.scm | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/guix/channels.scm b/guix/channels.scm index f26ccbc3ae..0b776ab211 100644 --- a/guix/channels.scm +++ b/guix/channels.scm @@ -25,6 +25,7 @@ url+commit->name commit-difference repository-info + commit-short-id with-repository) #:autoload (guix git-authenticate) (authenticate-repository) #:autoload (guix openpgp) (openpgp-public-key-fingerprint @@ -339,9 +340,6 @@ result is unspecified." (apply-patch patch checkout)) (loop rest))))) -(define commit-short-id - (compose (cut string-take <> 7) oid->string commit-id)) - (define* (authenticate-channel channel checkout commit #:key (keyring-reference-prefix "origin/")) "Authenticate the given COMMIT of CHANNEL, available at CHECKOUT, a diff --git a/guix/git.scm b/guix/git.scm index 760b064a9c..eab84ea798 100644 --- a/guix/git.scm +++ b/guix/git.scm @@ -67,6 +67,7 @@ commit-relation commit-descendant? commit-id? + commit-short-id remote-refs @@ -233,6 +234,9 @@ is a tag name. This is based on a simple heuristic so use with care!" (and (= (string-length str) 40) (string-every char-set:hex-digit str))) +(define commit-short-id + (compose (cut string-take <> 7) oid->string commit-id)) + (define (resolve-reference repository ref) "Resolve the branch, commit or tag specified by REF, and return the corresponding Git object." |