worktree: add relative cli/config options to `move` command

This teaches the `worktree move` command to respect the
`--[no-]relative-paths` CLI option and `worktree.useRelativePaths`
config setting. If an existing worktree is moved with `--relative-paths`
the new path will be relative (and visa-versa).

Signed-off-by: Caleb White <cdwhite3@pm.me>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/worktree.c b/builtin/worktree.c
index e3b4a71ee0bc13d5e817cf7dcc398e9e2bd975de..302151506981718658db1cd338cd9064688f5c14 100644 (file)
--- a/builtin/worktree.c
+++ b/builtin/worktree.c
@@ -1190,6 +1190,8 @@ static int move_worktree(int ac, const char **av, const char *prefix)
                OPT__FORCE(&force,
                         N_("force move even if worktree is dirty or locked"),
                         PARSE_OPT_NOCOMPLETE),
+               OPT_BOOL(0, "relative-paths", &use_relative_paths,
+                        N_("use relative paths for worktrees")),
                OPT_END()
        };
        struct worktree **worktrees, *wt;
@@ -1242,7 +1244,7 @@ static int move_worktree(int ac, const char **av, const char *prefix)
        if (rename(wt->path, dst.buf) == -1)
                die_errno(_("failed to move '%s' to '%s'"), wt->path, dst.buf);
 
-       update_worktree_location(wt, dst.buf);
+       update_worktree_location(wt, dst.buf, use_relative_paths);
 
        strbuf_release(&dst);
        free_worktrees(worktrees);

diff --git a/t/t2403-worktree-move.sh b/t/t2403-worktree-move.sh
index 901342ea09b51a8e832f1109fbb737df84283aa2..422c1a05580057b18ab8bfdfe38da4d723749493 100755 (executable)
--- a/t/t2403-worktree-move.sh
+++ b/t/t2403-worktree-move.sh
@@ -247,4 +247,29 @@ test_expect_success 'not remove a repo with initialized submodule' '
        )
 '
 
+test_expect_success 'move worktree with absolute path to relative path' '
+       test_config worktree.useRelativePaths false &&
+       git worktree add ./absolute &&
+       git worktree move --relative-paths absolute relative &&
+       echo "gitdir: ../.git/worktrees/absolute" >expect &&
+       test_cmp expect relative/.git &&
+       echo "../../../relative/.git" >expect &&
+       test_cmp expect .git/worktrees/absolute/gitdir &&
+       test_config worktree.useRelativePaths true &&
+       git worktree move relative relative2 &&
+       echo "gitdir: ../.git/worktrees/absolute" >expect &&
+       test_cmp expect relative2/.git &&
+       echo "../../../relative2/.git" >expect &&
+       test_cmp expect .git/worktrees/absolute/gitdir
+'
+
+test_expect_success 'move worktree with relative path to absolute path' '
+       test_config worktree.useRelativePaths true &&
+       git worktree move --no-relative-paths relative2 absolute &&
+       echo "gitdir: $(pwd)/.git/worktrees/absolute" >expect &&
+       test_cmp expect absolute/.git &&
+       echo "$(pwd)/absolute/.git" >expect &&
+       test_cmp expect .git/worktrees/absolute/gitdir
+'
+
 test_done

diff --git a/worktree.c b/worktree.c
index cf05045cc973f121a0a76b5ccfa731acf25d1a73..c749cb16994cf46ccccd4c2880ac917e497671b8 100644 (file)
--- a/worktree.c
+++ b/worktree.c
@@ -376,32 +376,28 @@ done:
        return ret;
 }
 
-void update_worktree_location(struct worktree *wt, const char *path_)
+void update_worktree_location(struct worktree *wt, const char *path_,
+                             int use_relative_paths)
 {
        struct strbuf path = STRBUF_INIT;
-       struct strbuf repo = STRBUF_INIT;
-       struct strbuf file = STRBUF_INIT;
-       struct strbuf tmp = STRBUF_INIT;
+       struct strbuf dotgit = STRBUF_INIT;
+       struct strbuf gitdir = STRBUF_INIT;
 
        if (is_main_worktree(wt))
                BUG("can't relocate main worktree");
 
-       strbuf_realpath(&repo, git_common_path("worktrees/%s", wt->id), 1);
+       strbuf_realpath(&gitdir, git_common_path("worktrees/%s/gitdir", wt->id), 1);
        strbuf_realpath(&path, path_, 1);
+       strbuf_addf(&dotgit, "%s/.git", path.buf);
        if (fspathcmp(wt->path, path.buf)) {
-               strbuf_addf(&file, "%s/gitdir", repo.buf);
-               write_file(file.buf, "%s/.git", relative_path(path.buf, repo.buf, &tmp));
-               strbuf_reset(&file);
-               strbuf_addf(&file, "%s/.git", path.buf);
-               write_file(file.buf, "gitdir: %s", relative_path(repo.buf, path.buf, &tmp));
+               write_worktree_linking_files(dotgit, gitdir, use_relative_paths);
 
                free(wt->path);
                wt->path = strbuf_detach(&path, NULL);
        }
        strbuf_release(&path);
-       strbuf_release(&repo);
-       strbuf_release(&file);
-       strbuf_release(&tmp);
+       strbuf_release(&dotgit);
+       strbuf_release(&gitdir);
 }
 
 int is_worktree_being_rebased(const struct worktree *wt,

diff --git a/worktree.h b/worktree.h
index fd040f5d999697b603df929679bdddd2ff7f6eea..9c699d080d8ebf37712044136679db3821ee1f63 100644 (file)
--- a/worktree.h
+++ b/worktree.h
@@ -117,8 +117,8 @@ int validate_worktree(const struct worktree *wt,
 /*
  * Update worktrees/xxx/gitdir with the new path.
  */
-void update_worktree_location(struct worktree *wt,
-                             const char *path_);
+void update_worktree_location(struct worktree *wt, const char *path_,
+                             int use_relative_paths);
 
 typedef void (* worktree_repair_fn)(int iserr, const char *path,
                                    const char *msg, void *cb_data);