git: 'update-cached-checkout' has a new #:check-out? parameter.
* guix/git.scm (update-cached-checkout): Add #:check-out? parameter and honor it.
This commit is contained in:
parent
1c058c382a
commit
a620c9d51d
11
guix/git.scm
11
guix/git.scm
|
@ -292,6 +292,7 @@ definitely available in REPOSITORY, false otherwise."
|
||||||
#:key
|
#:key
|
||||||
(ref '(branch . "master"))
|
(ref '(branch . "master"))
|
||||||
recursive?
|
recursive?
|
||||||
|
(check-out? #t)
|
||||||
starting-commit
|
starting-commit
|
||||||
(log-port (%make-void-port "w"))
|
(log-port (%make-void-port "w"))
|
||||||
(cache-directory
|
(cache-directory
|
||||||
|
@ -306,7 +307,10 @@ provided) as returned by 'commit-relation'.
|
||||||
REF is pair whose key is [branch | commit | tag | tag-or-commit ] and value
|
REF is pair whose key is [branch | commit | tag | tag-or-commit ] and value
|
||||||
the associated data: [<branch name> | <sha1> | <tag name> | <string>].
|
the associated data: [<branch name> | <sha1> | <tag name> | <string>].
|
||||||
|
|
||||||
When RECURSIVE? is true, check out submodules as well, if any."
|
When RECURSIVE? is true, check out submodules as well, if any.
|
||||||
|
|
||||||
|
When CHECK-OUT? is true, reset the cached working tree to REF; otherwise leave
|
||||||
|
it unchanged."
|
||||||
(define canonical-ref
|
(define canonical-ref
|
||||||
;; We used to require callers to specify "origin/" for each branch, which
|
;; We used to require callers to specify "origin/" for each branch, which
|
||||||
;; made little sense since the cache should be transparent to them. So
|
;; made little sense since the cache should be transparent to them. So
|
||||||
|
@ -337,7 +341,10 @@ When RECURSIVE? is true, check out submodules as well, if any."
|
||||||
|
|
||||||
;; Note: call 'commit-relation' from here because it's more efficient
|
;; Note: call 'commit-relation' from here because it's more efficient
|
||||||
;; than letting users re-open the checkout later on.
|
;; than letting users re-open the checkout later on.
|
||||||
(let* ((oid (switch-to-ref repository canonical-ref))
|
(let* ((oid (if check-out?
|
||||||
|
(switch-to-ref repository canonical-ref)
|
||||||
|
(object-id
|
||||||
|
(resolve-reference repository canonical-ref))))
|
||||||
(new (and starting-commit
|
(new (and starting-commit
|
||||||
(commit-lookup repository oid)))
|
(commit-lookup repository oid)))
|
||||||
(old (and starting-commit
|
(old (and starting-commit
|
||||||
|
|
Loading…
Reference in New Issue