From: "SZEDER Gábor" <szeder.dev@gmail.com>
To: Peter Jones <pjones@redhat.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 1/2] Make die_if_checked_out() ignore missing worktree checkouts.
Date: Thu, 17 Oct 2019 18:44:26 +0200 [thread overview]
Message-ID: <20191017164426.GX29845@szeder.dev> (raw)
In-Reply-To: <20191017162826.1064257-1-pjones@redhat.com>
On Thu, Oct 17, 2019 at 12:28:25PM -0400, Peter Jones wrote:
> Currently if you do, for example:
>
> $ git worktree add path foo
>
> And "foo" has already been checked out at some other path, but the user
> has removed it without pruning, you'll get an error that the branch is
> already checked out. It isn't meaningfully checked out, the repo's
> data is just stale and no longer reflects reality.
>
> This makes it so that if nothing is present where a worktree is
> supposedly checked out, we ignore that the worktree exists, and let it
> get cleaned up the next time worktrees are pruned.
>
> (I would prune it instead, but prune isn't available from libgit
> currently.)
>
> Signed-off-by: Peter Jones <pjones@redhat.com>
> ---
> branch.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/branch.c b/branch.c
> index 579494738a7..60322ded953 100644
> --- a/branch.c
> +++ b/branch.c
> @@ -360,6 +360,9 @@ void die_if_checked_out(const char *branch, int ignore_current_worktree)
> wt = find_shared_symref("HEAD", branch);
> if (!wt || (ignore_current_worktree && wt->is_current))
> return;
> + if (access(wt->path, F_OK) < 0 &&
> + (errno == ENOENT || errno == ENOTDIR))
> + return;
I think this check is insuffient: even if the directory of the working
tree is not present, the working tree might still exist, and should
not be ignored (or deleted/pruned in the second patch).
See the description of 'git worktree lock' for details.
> skip_prefix(branch, "refs/heads/", &branch);
> die(_("'%s' is already checked out at '%s'"),
> branch, wt->path);
> --
> 2.23.0
>
prev parent reply other threads:[~2019-10-17 16:44 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-17 16:28 [PATCH 1/2] Make die_if_checked_out() ignore missing worktree checkouts Peter Jones
2019-10-17 16:28 ` [PATCH 2/2] Make "git branch -d" prune missing worktrees automatically Peter Jones
2019-10-17 17:28 ` Eric Sunshine
2019-10-18 19:43 ` Peter Jones
2019-10-18 19:45 ` [PATCH v2 1/4] libgit: Add a read-only helper to test the worktree lock Peter Jones
2019-10-18 19:45 ` [PATCH v2 2/4] libgit: Expose more worktree functionality Peter Jones
2019-10-21 1:59 ` Junio C Hamano
2019-10-18 19:45 ` [PATCH v2 3/4] Make die_if_checked_out() prune missing checkouts of unlocked worktrees Peter Jones
2019-10-21 2:09 ` Junio C Hamano
2019-10-18 19:45 ` [PATCH v2 4/4] Make "git branch -d" prune missing worktrees automatically Peter Jones
2019-10-21 1:36 ` [PATCH v2 1/4] libgit: Add a read-only helper to test the worktree lock Junio C Hamano
2019-11-08 10:14 ` [PATCH 2/2] Make "git branch -d" prune missing worktrees automatically Eric Sunshine
2019-11-08 14:56 ` Phillip Wood
2019-11-09 11:34 ` Eric Sunshine
2019-10-17 16:44 ` SZEDER Gábor [this message]
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=20191017164426.GX29845@szeder.dev \
--to=szeder.dev@gmail.com \
--cc=git@vger.kernel.org \
--cc=pjones@redhat.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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).