From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id WOdUFn521V4CVAAA0tVLHw (envelope-from ) for ; Mon, 01 Jun 2020 21:43:26 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id IAAeEn521V7hLgAA1q6Kng (envelope-from ) for ; Mon, 01 Jun 2020 21:43:26 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 0608694030A for ; Mon, 1 Jun 2020 21:43:26 +0000 (UTC) Received: from localhost ([::1]:43172 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jfsDM-0000lQ-UE for larch@yhetil.org; Mon, 01 Jun 2020 17:43:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59092) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jfsD0-0000WW-RK for guix-patches@gnu.org; Mon, 01 Jun 2020 17:43:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:53922) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jfsD0-0007fa-GH for guix-patches@gnu.org; Mon, 01 Jun 2020 17:43:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jfsD0-0002Qa-Eg for guix-patches@gnu.org; Mon, 01 Jun 2020 17:43:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41653] [PATCH 2/4] git-authenticate: Don't hard-code "origin/" for keyring reference. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 01 Jun 2020 21:43:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41653 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 41653@debbugs.gnu.org Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 41653-submit@debbugs.gnu.org id=B41653.15910477329262 (code B ref 41653); Mon, 01 Jun 2020 21:43:02 +0000 Received: (at 41653) by debbugs.gnu.org; 1 Jun 2020 21:42:12 +0000 Received: from localhost ([127.0.0.1]:37233 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jfsCB-0002PK-OJ for submit@debbugs.gnu.org; Mon, 01 Jun 2020 17:42:11 -0400 Received: from eggs.gnu.org ([209.51.188.92]:50550) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jfsBz-0002Nw-R9 for 41653@debbugs.gnu.org; Mon, 01 Jun 2020 17:42:10 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:57936) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jfsBu-000730-J6; Mon, 01 Jun 2020 17:41:54 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=51784 helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1jfsBu-0007Sn-3q; Mon, 01 Jun 2020 17:41:54 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Mon, 1 Jun 2020 23:41:45 +0200 Message-Id: <20200601214147.3357-2-ludo@gnu.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200601214147.3357-1-ludo@gnu.org> References: <20200601214147.3357-1-ludo@gnu.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -3.3 (---) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: 5.49 X-TUID: hVKA3GARsQal * 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