From: "Ludovic Courtès" <ludo@gnu.org>
To: 41653@debbugs.gnu.org
Cc: "Ludovic Courtès" <ludo@gnu.org>
Subject: [bug#41653] [PATCH 2/4] git-authenticate: Don't hard-code "origin/" for keyring reference.
Date: Mon, 1 Jun 2020 23:41:45 +0200 [thread overview]
Message-ID: <20200601214147.3357-2-ludo@gnu.org> (raw)
In-Reply-To: <20200601214147.3357-1-ludo@gnu.org>
* 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 --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)))
--
2.26.2
next prev parent reply other threads:[~2020-06-01 21:43 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-01 21:29 [bug#41653] [PATCH 0/4] Add (guix git-authenticate) with tests Ludovic Courtès
2020-06-01 21:41 ` [bug#41653] [PATCH 1/4] Add (guix git-authenticate) Ludovic Courtès
2020-06-01 21:41 ` Ludovic Courtès [this message]
2020-06-01 21:41 ` [bug#41653] [PATCH 3/4] git-authenticate: Raise proper SRFI-35 conditions Ludovic Courtès
2020-06-01 21:41 ` [bug#41653] [PATCH 4/4] git-authenticate: Add tests Ludovic Courtès
2020-06-05 21:13 ` [bug#41653] [PATCH 0/4] Add (guix git-authenticate) with tests Ludovic Courtès
2020-06-07 21:19 ` Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200601214147.3357-2-ludo@gnu.org \
--to=ludo@gnu.org \
--cc=41653@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).