diff mbox series

[bug#70132,03/11] channels: Move ‘commit-short-id’ to (guix git).

Message ID 40070393934abb8d6a785857dc3806217e64817b.1712002698.git.ludo@gnu.org
State New
Headers show
Series Improve startup time and memory footprint for short-lived commands | expand

Commit Message

Ludovic Courtès April 1, 2024, 8:25 p.m. UTC 
* guix/channels.scm (commit-short-id): Move to…
* guix/git.scm (commit-short-id): … here.

Change-Id: If4b34b1d82b1aa5068d157f26e57e8aecc967061
---
 guix/channels.scm | 4 +---
 guix/git.scm      | 4 ++++
 2 files changed, 5 insertions(+), 3 deletions(-)
diff mbox series

Patch

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 @@  (define-module (guix channels)
                            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 @@  (define (apply-patches checkout commit patches)
          (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 @@  (define-module (guix git)
             commit-relation
             commit-descendant?
             commit-id?
+            commit-short-id
 
             remote-refs
 
@@ -233,6 +234,9 @@  (define (commit-id? str)
   (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."