From: ludo@gnu.org (Ludovic Courtès)
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: Fri, 21 Sep 2018 11:48:29 +0200 [thread overview]
Message-ID: <87sh235ggi.fsf@gnu.org> (raw)
In-Reply-To: <20180915101034.10102-1-mbakke@fastmail.com> (Marius Bakke's message of "Sat, 15 Sep 2018 12:10:34 +0200")
Hello Marius!
Marius Bakke <mbakke@fastmail.com> skribis:
> 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".
> ---
>
> Notes:
> Guix,
>
> This fixes (current-guix) for me in a worktree. Testing needed on other git
> setups!
>
> guix/git-download.scm | 9 ++++++---
> 1 file changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/guix/git-download.scm b/guix/git-download.scm
> index 24cf11be5..a7c8173f4 100644
> --- a/guix/git-download.scm
> +++ b/guix/git-download.scm
> @@ -158,19 +158,22 @@ also includes directories, not just regular files. The returned file names
> are relative to DIRECTORY, which is not necessarily the root of the checkout."
> (let* ((directory (canonicalize-path directory))
> (dot-git (repository-discover directory))
> - (top (dirname dot-git))
> (repository (repository-open dot-git))
> + (workdir (canonicalize-path
> + ;; XXX: This variable is mistakenly private in Guile-Git 0.1.0.
> + ((@@ (git repository) repository-working-directory)
> + repository)))
I think we can avoid the call to ‘canonicalize-path’ here, can’t we?
It’s costly, and since we did it just above, it shouldn’t be needed
here.
Otherwise LGTM, thank you!
Ludo’.
next prev parent reply other threads:[~2018-09-21 9:49 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
2018-09-21 9:49 ` Ludovic Courtès
2018-09-21 9:48 ` Ludovic Courtès [this message]
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=87sh235ggi.fsf@gnu.org \
--to=ludo@gnu.org \
--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.