mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

worktree: add relative cli/config options to move command

Browse Source 
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>
This commit is contained in:
Caleb White
2024-11-29 22:23:03 +00:00
committed by Junio C Hamano
parent b7016344f1
commit 298d2917e2
4 changed files with 39 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/worktree.c
View File

@ -1190,6 +1190,8 @@ static int move_worktree(int ac, const char **av, const char *prefix)
OPT__FORCE(&force, OPT__FORCE(&force,
N_("force move even if worktree is dirty or locked"), N_("force move even if worktree is dirty or locked"),
PARSE_OPT_NOCOMPLETE), PARSE_OPT_NOCOMPLETE),
OPT_BOOL(0, "relative-paths", &use_relative_paths,
N_("use relative paths for worktrees")),
OPT_END() OPT_END()
}; };
struct worktree **worktrees, *wt; 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) if (rename(wt->path, dst.buf) == -1)
die_errno(_("failed to move '%s' to '%s'"), wt->path, dst.buf); 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); strbuf_release(&dst);
free_worktrees(worktrees); free_worktrees(worktrees);

25
t/t2403-worktree-move.sh
View File

@ -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 test_done

22
worktree.c
View File

@ -376,32 +376,28 @@ done:
return ret; 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 path = STRBUF_INIT;
struct strbuf repo = STRBUF_INIT; struct strbuf dotgit = STRBUF_INIT;
struct strbuf file = STRBUF_INIT; struct strbuf gitdir = STRBUF_INIT;
struct strbuf tmp = STRBUF_INIT;
if (is_main_worktree(wt)) if (is_main_worktree(wt))
BUG("can't relocate main worktree"); 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_realpath(&path, path_, 1);
strbuf_addf(&dotgit, "%s/.git", path.buf);
if (fspathcmp(wt->path, path.buf)) { if (fspathcmp(wt->path, path.buf)) {
strbuf_addf(&file, "%s/gitdir", repo.buf); write_worktree_linking_files(dotgit, gitdir, use_relative_paths);
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));
free(wt->path); free(wt->path);
wt->path = strbuf_detach(&path, NULL); wt->path = strbuf_detach(&path, NULL);
} }
strbuf_release(&path); strbuf_release(&path);
strbuf_release(&repo); strbuf_release(&dotgit);
strbuf_release(&file); strbuf_release(&gitdir);
strbuf_release(&tmp);
} }
int is_worktree_being_rebased(const struct worktree *wt, int is_worktree_being_rebased(const struct worktree *wt,

4
worktree.h
View File

@ -117,8 +117,8 @@ int validate_worktree(const struct worktree *wt,
/* /*
* Update worktrees/xxx/gitdir with the new path. * Update worktrees/xxx/gitdir with the new path.
*/ */
void update_worktree_location(struct worktree *wt, void update_worktree_location(struct worktree *wt, const char *path_,
const char *path_); int use_relative_paths);
typedef void (* worktree_repair_fn)(int iserr, const char *path, typedef void (* worktree_repair_fn)(int iserr, const char *path,
const char *msg, void *cb_data); const char *msg, void *cb_data);