diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2020-07-15 23:59:05 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2020-07-23 00:22:25 +0200 |
| commit | a620c9d51d57c8277ec75892c7eee8f9c84fa96f (patch) | |
| tree | 4de8af53644e4f0c54225ebc63ae326b66eb5b4e /guix | |
| parent | 1c058c382a0fb80c96572c0f419a6660b2b5bb9d (diff) | |
| download | guix-patches-a620c9d51d57c8277ec75892c7eee8f9c84fa96f.tar guix-patches-a620c9d51d57c8277ec75892c7eee8f9c84fa96f.tar.gz | |
git: 'update-cached-checkout' has a new #:check-out? parameter.
* guix/git.scm (update-cached-checkout): Add #:check-out? parameter and
honor it.
Diffstat (limited to 'guix')
| -rw-r--r-- | guix/git.scm | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/guix/git.scm b/guix/git.scm index ca67b1d37c..7f8f9addfb 100644 --- a/guix/git.scm +++ b/guix/git.scm @@ -292,6 +292,7 @@ definitely available in REPOSITORY, false otherwise." #:key (ref '(branch . "master")) recursive? + (check-out? #t) starting-commit (log-port (%make-void-port "w")) (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 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 ;; We used to require callers to specify "origin/" for each branch, which ;; 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 ;; 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 (commit-lookup repository oid))) (old (and starting-commit |