From: Leo Famulari <leo@famulari.name>
To: Marius Bakke <mbakke@fastmail.com>
Cc: 32740@debbugs.gnu.org
Subject: [bug#32740] [PATCH] git-download: Don't assume the git checkout is the parent of ".git".
Date: Mon, 17 Sep 2018 15:19:39 -0400 [thread overview]
Message-ID: <20180917191939.GA7741@jasmine.lan> (raw)
In-Reply-To: <20180915101034.10102-1-mbakke@fastmail.com>
[-- Attachment #1: Type: text/plain, Size: 2370 bytes --]
On Sat, Sep 15, 2018 at 12:10:34PM +0200, Marius Bakke wrote:
> This makes it play nicely with worktrees.
>
> * guix/git-download.scm (git-file-list): Use REPOSITORY-WORKING-DIRECTORY to
> locate checkout. Rename from "top" to "workdir".
Thanks!
> ---
>
> Notes:
> Guix,
>
> This fixes (current-guix) for me in a worktree. Testing needed on other 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 (#<<service> type: #<service-type mingetty cf7?> ?))
592:29 18 (map1 (#<<service> type: #<service-type mingetty cf7?> ?))
592:29 17 (map1 (#<<service> type: #<service-type mingetty cf7?> ?))
592:29 16 (map1 (#<<service> type: #<service-type syslog c7537?> ?))
592:17 15 (map1 (#<<service> type: #<service-type guix 43f8be0?> ?))
In ice-9/eval.scm:
196:43 14 (_ #(#(#(#<directory (gnu tests install) 110a20a0>) ?) ?))
293:34 13 (_ #(#(#(#<directory (gnu tests install) 110a20a0>) ?) ?))
293:34 12 (_ #(#(#(#<directory (gnu packages package-manag?> ?)) ?))
174:20 11 (_ #(#(#(#<directory (gnu packages package-manag?> ?)) ?))
177:49 10 (lp (#<procedure ed4d8c0 at ice-9/eval.scm:282:4 (en?> ?))
177:49 9 (lp (#<procedure ed4d8a0 at ice-9/eval.scm:282:4 (en?> ?))
177:49 8 (lp (#<procedure ed4d880 at ice-9/eval.scm:282:4 (en?> ?))
177:32 7 (lp (#<procedure ed4d860 at ice-9/eval.scm:182:7 (env)>))
In unknown file:
6 (force #<promise #<procedure 8aa6580 at ice-9/eval.scm:?>)
In ice-9/eval.scm:
293:34 5 (_ #(#(#<directory (gnu packages package-management?> ?)))
In ice-9/boot-9.scm:
829:9 4 (catch git-error #<procedure ed4d460 at ice-9/eval.scm?> ?)
In ice-9/eval.scm:
293:34 3 (_ #(#(#<directory (guix git-download) 3ec5c80> "/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.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
next prev parent reply other threads:[~2018-09-17 19:23 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-15 10:10 [bug#32740] [PATCH] git-download: Don't assume the git checkout is the parent of ".git" Marius Bakke
2018-09-17 19:19 ` Leo Famulari [this message]
2018-09-21 9:49 ` Ludovic Courtès
2018-09-21 9:48 ` Ludovic Courtès
2018-09-23 13:13 ` Marius Bakke
2018-09-23 19:55 ` Ludovic Courtès
2018-09-25 22:41 ` bug#32740: " Marius Bakke
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180917191939.GA7741@jasmine.lan \
--to=leo@famulari.name \
--cc=32740@debbugs.gnu.org \
--cc=mbakke@fastmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.