[PATCH 09/11] worktree move: accept destination as directory

[Nguyễn Thái Ngọc Duy]

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 <pclo...@gmail.com>
Signed-off-by: Junio C Hamano <gits...@pobox.com>
---
 builtin/worktree.c | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/builtin/worktree.c b/builtin/worktree.c
index 0d8b57ceb3..900b68bb5d 100644
--- a/builtin/worktree.c
+++ b/builtin/worktree.c
@@ -541,7 +541,13 @@ static int move_worktree(int ac, const char **av, const 
char *prefix)
        strbuf_addstr(&dst, prefix_filename(prefix,
                                            strlen(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
+                */
+               ;
+       else if (file_exists(dst.buf))
                die(_("target '%s' already exists"), av[1]);
 
        worktrees = get_worktrees(0);
@@ -559,6 +565,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);
 
-- 
2.11.0.157.gd943d85