From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55670) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g4w1r-0003P2-O4 for guix-patches@gnu.org; Tue, 25 Sep 2018 18:42:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g4w1q-0006Qh-QC for guix-patches@gnu.org; Tue, 25 Sep 2018 18:42:03 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:49898) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1g4w1q-0006QQ-Ka for guix-patches@gnu.org; Tue, 25 Sep 2018 18:42:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1g4w1q-0007f0-HJ for guix-patches@gnu.org; Tue, 25 Sep 2018 18:42:02 -0400 Subject: bug#32740: [PATCH] git-download: Don't assume the git checkout is the parent of ".git". Resent-To: guix-patches@gnu.org Resent-Message-ID: From: Marius Bakke In-Reply-To: <87d0t4rnss.fsf@gnu.org> References: <20180915101034.10102-1-mbakke@fastmail.com> <87sh235ggi.fsf@gnu.org> <87y3bsl5lm.fsf@fastmail.com> <87d0t4rnss.fsf@gnu.org> Date: Wed, 26 Sep 2018 00:41:52 +0200 Message-ID: <87lg7pkxn3.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" 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: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 32740-done@debbugs.gnu.org --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable ludo@gnu.org (Ludovic Court=C3=A8s) writes: > 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-DIRECTOR= Y 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, = or a generic name if #f." >> The result is similar to that of the 'git ls-files' command, except tha= t it >> also includes directories, not just regular files. The returned file n= ames >> are relative to DIRECTORY, which is not necessarily the root of the che= ckout." >> - (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 = slash? Good idea. > Otherwise LGTM, thank you! Pushed as 280fc8351230a8fea086d9bbce919ba8395f312c, thanks! --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAluqubAACgkQoqBt8qM6 VPrqUQf+INwcG095FB4qf3gOCStrlA4/104C86u89OzRvjJ/yAu1Pp1q0smIgTlT sWKOw4JbBypMeAJW1t1OXpOMA/igFEoWtg4v8IyB2A6bIS57+m8bA3f190f5Y5oz +hk4Irw5+3tAD1uv0eZiPhyJZAr4y/+8hMI6Gi65f0VuDS/IulrYxyylM+tGcFMh bzbPL7fJzeXsE8gZ63R3g59h+FfBI3PQkYpr7Ns/XInMo7zkdtizqbaOWuZArehb rMd8nxMeoIyY1dxg82i5uNKX10DAzGuvVTRcNksdXwgZokeoD178Nb+wI8rutPyn wYyVeVFcfAg+5fhq+NHJbORiZpYckw== =0BV1 -----END PGP SIGNATURE----- --=-=-=--