From patchwork Wed Jun 5 18:56:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Vollmert X-Patchwork-Id: 14239 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id EAC8B170B8; Wed, 5 Jun 2019 19:57:15 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 99A22170B6 for ; Wed, 5 Jun 2019 19:57:15 +0100 (BST) Received: from localhost ([127.0.0.1]:48448 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hYb62-00070g-HY for patchwork@mira.cbaines.net; Wed, 05 Jun 2019 14:57:14 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49452) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hYb5v-00070J-9W for guix-patches@gnu.org; Wed, 05 Jun 2019 14:57:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hYb5t-0001VZ-Bw for guix-patches@gnu.org; Wed, 05 Jun 2019 14:57:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:34676) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hYb5p-0001Tc-Tq for guix-patches@gnu.org; Wed, 05 Jun 2019 14:57:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hYb5p-00030w-Rq for guix-patches@gnu.org; Wed, 05 Jun 2019 14:57:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36106] [PATCH] guix: git-download: Remove explicit import. Resent-From: Robert Vollmert Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 05 Jun 2019 18:57:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 36106 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36106@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.155976100511560 (code B ref -1); Wed, 05 Jun 2019 18:57:01 +0000 Received: (at submit) by debbugs.gnu.org; 5 Jun 2019 18:56:45 +0000 Received: from localhost ([127.0.0.1]:48220 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hYb5Z-00030O-C5 for submit@debbugs.gnu.org; Wed, 05 Jun 2019 14:56:45 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34990) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hYb5X-00030B-U5 for submit@debbugs.gnu.org; Wed, 05 Jun 2019 14:56:44 -0400 Received: from lists.gnu.org ([209.51.188.17]:45522) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hYb5S-0000ut-Nn for submit@debbugs.gnu.org; Wed, 05 Jun 2019 14:56:38 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49371) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hYb5R-000704-Sl for guix-patches@gnu.org; Wed, 05 Jun 2019 14:56:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hYb5Q-0000tr-Q2 for guix-patches@gnu.org; Wed, 05 Jun 2019 14:56:37 -0400 Received: from mx1.mailbox.org ([2001:67c:2050:104:0:1:25:1]:38872) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hYb5Q-0000pB-KJ for guix-patches@gnu.org; Wed, 05 Jun 2019 14:56:36 -0400 Received: from smtp1.mailbox.org (smtp1.mailbox.org [IPv6:2001:67c:2050:105:465:1:1:0]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by mx1.mailbox.org (Postfix) with ESMTPS id B00C14EF5C; Wed, 5 Jun 2019 20:56:32 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter06.heinlein-hosting.de (spamfilter06.heinlein-hosting.de [80.241.56.125]) (amavisd-new, port 10030) with ESMTP id wnk_lN-bTbkg; Wed, 5 Jun 2019 20:56:16 +0200 (CEST) From: Robert Vollmert Date: Wed, 5 Jun 2019 20:56:14 +0200 Message-Id: <20190605185614.80737-1-rob@vllmrt.net> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Robert Vollmert Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches With guile-git version 0.2, repository-working-directory is no longer private. * guix/git-download.scm (git-file-list): Refer to public repository-working-directory. --- guix/git-download.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/guix/git-download.scm b/guix/git-download.scm index 6cf267d6c8..f904d11c25 100644 --- a/guix/git-download.scm +++ b/guix/git-download.scm @@ -185,9 +185,7 @@ are relative to DIRECTORY, which is not necessarily the root of the checkout." (directory (string-append (canonicalize-path directory) "/")) (dot-git (repository-discover directory)) (repository (repository-open dot-git)) - ;; XXX: This procedure is mistakenly private in Guile-Git 0.1.0. - (workdir ((@@ (git repository) repository-working-directory) - repository)) + (workdir (repository-working-directory repository)) (head (repository-head repository)) (oid (reference-target head)) (commit (commit-lookup repository oid))