From: Junio C Hamano <gitster@pobox.com>
To: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 4/6] worktree move: accept destination as directory
Date: Thu, 20 Apr 2017 19:44:57 -0700 [thread overview]
Message-ID: <xmqqzifa5viu.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20170420101024.7593-5-pclouds@gmail.com> ("Nguyễn Thái Ngọc Duy"'s message of "Thu, 20 Apr 2017 17:10:22 +0700")
Nguyễn Thái Ngọc Duy <pclouds@gmail.com> writes:
> Similar to "mv a b/", which is actually "mv a b/a", we extract basename
> of source worktree and create a directory of the same name at
> destination if dst path is a directory.
>
> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
> ---
> builtin/worktree.c | 19 ++++++++++++++++++-
> 1 file changed, 18 insertions(+), 1 deletion(-)
>
> diff --git a/builtin/worktree.c b/builtin/worktree.c
> index e3fbfe2a71..116507e47e 100644
> --- a/builtin/worktree.c
> +++ b/builtin/worktree.c
> @@ -540,7 +540,13 @@ static int move_worktree(int ac, const char **av, const char *prefix)
> usage_with_options(worktree_usage, options);
>
> strbuf_addstr(&dst, prefix_filename(prefix, av[1]));
> - if (file_exists(dst.buf))
> + if (is_directory(dst.buf))
> + /*
> + * keep going, dst will be appended after we get the
> + * source's absolute path
> + */
> + ;
Ugly. Why not do that "infer the real destination b/a when existing
directory b/ was given" here, without "else if" so that we can catch
"hey, b/a exists already" with the existing code? That way you do
not have to do is_directory() twice.
For that matter, perhaps we should go back to 3/6 and move the "if
dst.buf exists error out" to after wt is validated. That would make
it stand out why having these is_directory() on the same thing twice
is ugly, I would think.
> + else if (file_exists(dst.buf))
> die(_("target '%s' already exists"), av[1]);
>
> worktrees = get_worktrees(0);
> @@ -558,6 +564,17 @@ static int move_worktree(int ac, const char **av, const char *prefix)
> if (validate_worktree(wt, 0))
> return -1;
>
> + if (is_directory(dst.buf)) {
> + const char *sep = find_last_dir_sep(wt->path);
> +
> + if (!sep)
> + die(_("could not figure out destination name from '%s'"),
> + wt->path);
> + strbuf_addstr(&dst, sep);
> + if (file_exists(dst.buf))
> + die(_("target '%s' already exists"), dst.buf);
> + }
> +
> if (rename(wt->path, dst.buf) == -1)
> die_errno(_("failed to move '%s' to '%s'"), wt->path, dst.buf);
next prev parent reply other threads:[~2017-04-21 2:45 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-20 10:10 [PATCH 0/6] nd/worktree-move update Nguyễn Thái Ngọc Duy
2017-04-20 10:10 ` [PATCH 1/6] worktree.c: add validate_worktree() Nguyễn Thái Ngọc Duy
2017-04-21 2:16 ` Junio C Hamano
2017-04-24 11:13 ` Duy Nguyen
2017-04-20 10:10 ` [PATCH 2/6] worktree.c: add update_worktree_location() Nguyễn Thái Ngọc Duy
2017-04-21 2:22 ` Junio C Hamano
2017-04-20 10:10 ` [PATCH 3/6] worktree move: new command Nguyễn Thái Ngọc Duy
2017-04-21 2:39 ` Junio C Hamano
2017-04-20 10:10 ` [PATCH 4/6] worktree move: accept destination as directory Nguyễn Thái Ngọc Duy
2017-04-21 2:44 ` Junio C Hamano [this message]
2017-04-20 10:10 ` [PATCH 5/6] worktree move: refuse to move worktrees with submodules Nguyễn Thái Ngọc Duy
2017-04-21 2:47 ` Junio C Hamano
2017-04-20 10:10 ` [PATCH 6/6] worktree remove: new command Nguyễn Thái Ngọc Duy
2017-04-21 3:33 ` Junio C Hamano
2017-04-21 14:59 ` [PATCH 0/6] nd/worktree-move update Jeff King
-- strict thread matches above, loose matches on Subject: below --
2017-01-08 9:39 [PATCH 0/6] git worktree move/remove Nguyễn Thái Ngọc Duy
2017-01-08 9:40 ` [PATCH 4/6] worktree move: accept destination as directory Nguyễn Thái Ngọc Duy
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=xmqqzifa5viu.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=pclouds@gmail.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).