diff options
author | Ludovic Courtès <ludo@gnu.org> | 2020-05-20 17:57:54 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2020-05-25 00:00:28 +0200 |
commit | 8d1d56578aa95118650ed2197bfb7fac40f4218a (patch) | |
tree | d2d27f204da98f3f4fc43a757ca910e724acab81 /guix/channels.scm | |
parent | 9b049de84ed101e2c0a5d071e76f424b3bc46bd9 (diff) | |
download | guix-patches-8d1d56578aa95118650ed2197bfb7fac40f4218a.tar guix-patches-8d1d56578aa95118650ed2197bfb7fac40f4218a.tar.gz |
git: 'update-cached-checkout' returns the commit relation.
* guix/git.scm (update-cached-checkout): Add #:starting-commit
parameter. Call 'commit-relation' when #:starting-commit is true.
Always return the relation or #f as the third value.
(latest-repository-commit): Adjust accordingly.
* guix/import/opam.scm (get-opam-repository): Likewise.
* tests/channels.scm ("latest-channel-instances includes channel dependencies")
("latest-channel-instances excludes duplicate channel dependencies"):
Update mock of 'update-cached-checkout' accordingly.
Diffstat (limited to 'guix/channels.scm')
-rw-r--r-- | guix/channels.scm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/guix/channels.scm b/guix/channels.scm index e0a7a84f55..75b767a94c 100644 --- a/guix/channels.scm +++ b/guix/channels.scm @@ -218,7 +218,7 @@ result is unspecified." (and (string=? (basename file) ".git") (eq? 'directory (stat:type stat)))) - (let-values (((checkout commit) + (let-values (((checkout commit relation) (update-cached-checkout (channel-url channel) #:ref (channel-reference channel)))) (when (guix-channel? channel) |