diff mbox series

[bug#41653,2/4] git-authenticate: Don't hard-code "origin/" for keyring reference.

Message ID 20200601214147.3357-2-ludo@gnu.org
State Accepted
Headers show
Series [bug#41653,1/4] Add (guix git-authenticate). | expand

Checks

Context Check Description
cbaines/comparison success View comparision
cbaines/git branch success View Git branch
cbaines/applying patch fail View Laminar job
cbaines/applying patch fail View Laminar job
cbaines/applying patch fail View Laminar job

Commit Message

Ludovic Courtès June 1, 2020, 9:41 p.m. UTC 
* guix/git-authenticate.scm (load-keyring-from-reference): Remove
hard-coded "origin/".  Use BRANCH-ALL instead of BRANCH-REMOTE.
---
 guix/git-authenticate.scm | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
diff mbox series

Patch

diff --git a/guix/git-authenticate.scm b/guix/git-authenticate.scm
index 4df56fab59..4217ab6d27 100644
--- a/guix/git-authenticate.scm
+++ b/guix/git-authenticate.scm
@@ -161,9 +161,7 @@  may not be ASCII-armored."
 (define (load-keyring-from-reference repository reference)
   "Load the '.key' files from the tree at REFERENCE in REPOSITORY and return
 an OpenPGP keyring."
-  (let* ((reference (branch-lookup repository
-                                   (string-append "origin/" reference)
-                                   BRANCH-REMOTE))
+  (let* ((reference (branch-lookup repository reference BRANCH-ALL))
          (target    (reference-target reference))
          (commit    (commit-lookup repository target))
          (tree      (commit-tree commit)))