From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56035) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g4AU7-0008W4-4l for guix-patches@gnu.org; Sun, 23 Sep 2018 15:56:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g4AU6-0006I4-59 for guix-patches@gnu.org; Sun, 23 Sep 2018 15:56:02 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:46845) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1g4AU5-0006Hn-Tg for guix-patches@gnu.org; Sun, 23 Sep 2018 15:56:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1g4AU5-0006Tm-PM for guix-patches@gnu.org; Sun, 23 Sep 2018 15:56:01 -0400 Subject: [bug#32740] [PATCH] git-download: Don't assume the git checkout is the parent of ".git". Resent-Message-ID: From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=) References: <20180915101034.10102-1-mbakke@fastmail.com> <87sh235ggi.fsf@gnu.org> <87y3bsl5lm.fsf@fastmail.com> Date: Sun, 23 Sep 2018 21:55:47 +0200 In-Reply-To: <87y3bsl5lm.fsf@fastmail.com> (Marius Bakke's message of "Sun, 23 Sep 2018 15:13:09 +0200") Message-ID: <87d0t4rnss.fsf@gnu.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Marius Bakke Cc: 32740@debbugs.gnu.org Hello! Marius Bakke skribis: > From e8b443e1de0a5b1e3dfeee024cd0625790f4f834 Mon Sep 17 00:00:00 2001 > From: Marius Bakke > Date: Sat, 15 Sep 2018 11:53:40 +0200 > Subject: [PATCH] git-download: Don't assume the working directory is the > parent of ".git". > > * guix/git-download.scm (git-file-list): Use REPOSITORY-WORKING-DIRECTORY= to > locate checkout. Rename from "top" to "workdir". > --- > guix/git-download.scm | 13 ++++++------- > 1 file changed, 6 insertions(+), 7 deletions(-) > > diff --git a/guix/git-download.scm b/guix/git-download.scm > index 24cf11be5..eb20927c7 100644 > --- a/guix/git-download.scm > +++ b/guix/git-download.scm > @@ -156,22 +156,21 @@ HASH-ALGO (a symbol). Use NAME as the file name, o= r a generic name if #f." > The result is similar to that of the 'git ls-files' command, except that= it > also includes directories, not just regular files. The returned file na= mes > are relative to DIRECTORY, which is not necessarily the root of the chec= kout." > - (let* ((directory (canonicalize-path directory)) > + (let* ((directory (string-append (canonicalize-path directory) "/")) Could you just add a comment here explaining that =E2=80=98repository-working-directory=E2=80=99 always appends a trailing sl= ash? Otherwise LGTM, thank you! Ludo=E2=80=99.