From: Junio C Hamano <gitster@pobox.com>
To: Eric Sunshine <sunshine@sunshineco.com>
Cc: git@vger.kernel.org, "Duy Nguyen" <pclouds@gmail.com>,
"Jonathan Müller" <jonathanmueller.dev@gmail.com>,
"Shourya Shukla" <shouryashukla.oo@gmail.com>
Subject: Re: [PATCH 8/8] worktree: make "move" refuse to move atop missing registered worktree
Date: Mon, 08 Jun 2020 15:06:53 -0700 [thread overview]
Message-ID: <xmqqeeqpjjpe.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <20200608062356.40264-9-sunshine@sunshineco.com> (Eric Sunshine's message of "Mon, 8 Jun 2020 02:23:56 -0400")
Eric Sunshine <sunshine@sunshineco.com> writes:
> - if (file_exists(dst.buf))
> - die(_("target '%s' already exists"), dst.buf);
> + check_candidate_path(dst.buf, force, worktrees, "move");
OK. Moving to a location that is already occupied by an existing
file or a directory, even if that file or directory is not one of
the existing worktree, used to die here, but check_candidate_path()
performs that check and dies with almost the same message (it does
not say 'target'), so there is no loss of safety here. The check
done in the check_candidate_path() helper is even better in that it
allows an existing directory as long as it is empty.
> diff --git a/t/t2403-worktree-move.sh b/t/t2403-worktree-move.sh
> index 939d18d728..7035c9d72e 100755
> --- a/t/t2403-worktree-move.sh
> +++ b/t/t2403-worktree-move.sh
> @@ -112,6 +112,27 @@ test_expect_success 'move locked worktree (force)' '
> git worktree move --force --force flump ploof
> '
>
> +test_expect_success 'refuse to move worktree atop existing path' '
> + > bobble &&
Style?
> + git worktree add --detach beeble &&
> + test_must_fail git worktree move beeble bobble
> +'
> +
> +test_expect_success 'move atop existing but missing worktree' '
> + git worktree add --detach gnoo &&
> + git worktree add --detach pneu &&
> + rm -fr pneu &&
> + test_must_fail git worktree move gnoo pneu &&
> + git worktree move --force gnoo pneu &&
> +
> + git worktree add --detach nu &&
> + git worktree lock nu &&
> + rm -fr nu &&
> + test_must_fail git worktree move pneu nu &&
> + test_must_fail git worktree --force move pneu nu &&
> + git worktree move --force --force pneu nu
> +'
> +
> test_expect_success 'move a repo with uninitialized submodule' '
> git init withsub &&
> (
Thanks.
prev parent reply other threads:[~2020-06-08 22:07 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-08 6:23 [PATCH 0/8] worktree: tighten duplicate path detection Eric Sunshine
2020-06-08 6:23 ` [PATCH 1/8] worktree: factor out repeated string literal Eric Sunshine
2020-06-08 19:38 ` Shourya Shukla
2020-06-08 21:41 ` Eric Sunshine
2020-06-08 6:23 ` [PATCH 2/8] worktree: prune corrupted worktree even if locked Eric Sunshine
2020-06-08 21:23 ` Junio C Hamano
2020-06-09 17:34 ` Eric Sunshine
2020-06-08 6:23 ` [PATCH 3/8] worktree: give "should be pruned?" function more meaningful name Eric Sunshine
2020-06-08 21:25 ` Junio C Hamano
2020-06-08 6:23 ` [PATCH 4/8] worktree: make high-level pruning re-usable Eric Sunshine
2020-06-08 21:29 ` Junio C Hamano
2020-06-08 6:23 ` [PATCH 5/8] worktree: prune duplicate entries referencing same worktree path Eric Sunshine
2020-06-08 6:23 ` [PATCH 6/8] worktree: prune linked worktree referencing main " Eric Sunshine
2020-06-08 21:59 ` Junio C Hamano
2020-06-09 17:38 ` Eric Sunshine
2020-06-08 6:23 ` [PATCH 7/8] worktree: generalize candidate worktree path validation Eric Sunshine
2020-06-08 22:02 ` Junio C Hamano
2020-06-08 6:23 ` [PATCH 8/8] worktree: make "move" refuse to move atop missing registered worktree Eric Sunshine
2020-06-08 15:19 ` Eric Sunshine
2020-06-08 22:06 ` Junio C Hamano [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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqeeqpjjpe.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=jonathanmueller.dev@gmail.com \
--cc=pclouds@gmail.com \
--cc=shouryashukla.oo@gmail.com \
--cc=sunshine@sunshineco.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 public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).