From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53247) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g1z70-0000hQ-V4 for guix-patches@gnu.org; Mon, 17 Sep 2018 15:23:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g1z40-0002O8-4z for guix-patches@gnu.org; Mon, 17 Sep 2018 15:20:08 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:39115) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1g1z3y-0002H3-KJ for guix-patches@gnu.org; Mon, 17 Sep 2018 15:20:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1g1z3y-0005Eg-9s for guix-patches@gnu.org; Mon, 17 Sep 2018 15:20:02 -0400 Subject: [bug#32740] [PATCH] git-download: Don't assume the git checkout is the parent of ".git". Resent-Message-ID: Date: Mon, 17 Sep 2018 15:19:39 -0400 From: Leo Famulari Message-ID: <20180917191939.GA7741@jasmine.lan> References: <20180915101034.10102-1-mbakke@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="x+6KMIRAuhnl3hBn" Content-Disposition: inline In-Reply-To: <20180915101034.10102-1-mbakke@fastmail.com> 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 --x+6KMIRAuhnl3hBn Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sat, Sep 15, 2018 at 12:10:34PM +0200, Marius Bakke wrote: > This makes it play nicely with worktrees. >=20 > * guix/git-download.scm (git-file-list): Use REPOSITORY-WORKING-DIRECTORY= to > locate checkout. Rename from "top" to "workdir". Thanks! > --- >=20 > Notes: > Guix, > =20 > This fixes (current-guix) for me in a worktree. Testing needed on ot= her git > setups! To clarify what this fixes, I tried building a fresh worktree from scratch without your patch and it crashed: ------ LOAD gnu/tests/install.scm Backtrace: In srfi/srfi-1.scm: 592:29 19 (map1 (#< type: # ?)) 592:29 18 (map1 (#< type: # ?)) 592:29 17 (map1 (#< type: # ?)) 592:29 16 (map1 (#< type: # ?)) 592:17 15 (map1 (#< type: # ?)) In ice-9/eval.scm: 196:43 14 (_ #(#(#(#) ?) ?)) 293:34 13 (_ #(#(#(#) ?) ?)) 293:34 12 (_ #(#(#(# ?)) ?)) 174:20 11 (_ #(#(#(# ?)) ?)) 177:49 10 (lp (# ?)) 177:49 9 (lp (# ?)) 177:49 8 (lp (# ?)) 177:32 7 (lp (#)) In unknown file: 6 (force #) In ice-9/eval.scm: 293:34 5 (_ #(#(# ?))) In ice-9/boot-9.scm: 829:9 4 (catch git-error # ?) In ice-9/eval.scm: 293:34 3 (_ #(#(# "/ho?"))) 293:34 2 (_ #(#(#(#(#(#(#(#(#(#(#(#) ?) ?) ?) ?) ?) ?) ?) ?) ?) ?)) 159:9 1 (_ #(#(#(#(#(#(#(#(#(#(#(#) ?) ?) ?) ?) ?) ?) ?) ?) ?) ?)) In unknown file: 0 (string-drop "/home/leo/tmp/mytest" 35) ERROR: In procedure string-drop: Value out of range 0 to 20: 35 ------ Your patch avoids this crash, which I was stymied by a couple days ago! Has it always been there? I've been using Guix worktrees for a while. --x+6KMIRAuhnl3hBn Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEsFFZSPHn08G5gDigJkb6MLrKfwgFAluf/kgACgkQJkb6MLrK fwiRkRAAkygHaxwgiUyYKDRaO+Ip7KzFpR80lDagpzDFd9l2mnFYV8krpOBPqcdI 886F9L/DJPjPADYtmX7s/6b4nOhSrrnUiL8dhvD7PEv3W0S6lhZH1rKQhRbZrnj1 /MXxPEuHyT3Uv8aiIgxmA6jb+pRMXGGBZzHZ6VVs1DFyRr1JN9PpWkVXceq/3gD0 lF6O6X5vOR4vc41rbGBSEhdTzCAvtl290nKCMm9f5Wpr3cgPqwJS1JrMOzBJcNry ld1ebsViD/Qzbxs8NjAUTYHhXpTteDqfDk7oDkolVTLwrzrjFI4g4JgKasf4tb6f +i3+Zy6a7PGeoRfk0dykm3TfHmUnQrnuIsh2n7T6X6frc09hwfGVc9TEofybu39x pNmXftaXmDqMIXuw5vDRD80pF66lpucHmSjfsumSmScRRQXPYwYzhWqSNH70mnlm +fEXZxcCkSXt76Rln04vQShiVSa/voJthx5WPcwCuCj6SuW5LWIWXLOAUIZelPR6 yvTMqlMwgWE6J3CXFF7Y9QCWgrloAuQCBjpGhKPqlT4oVYNlr1dfXHDzIM4K8IIh gngK6m0hUckhxDBZJOnlN/ss79a7MRvZRiPe7doqsxppa82n84N9mOHkAWW4tpX7 Bd52s8MqrePIpFNYsX5OT4wr3RK8WF+3LhNK9hA9vW/zp2kijLg= =1JAQ -----END PGP SIGNATURE----- --x+6KMIRAuhnl3hBn--