From patchwork Thu Oct 31 05:06:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Caleb White X-Patchwork-Id: 13857573 Received: from mail-40133.protonmail.ch (mail-40133.protonmail.ch [185.70.40.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D66A57F460 for ; Thu, 31 Oct 2024 05:06:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.70.40.133 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730351175; cv=none; b=G5UmefVJL48npl+7HF3tKZ3qdKis7SC59BGoMCQPmDWsZ5G2pphyTODOTc82tWLujVXsxj5wFkGX8LFDY1NVY1aW41VGaAnK3CAJlW9Ax5KuNreBGMgC3oKqmjOevB663EmN3YVnNOrK73J1/fUu6wef2SJPMeGRe5PADUZgJQw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730351175; c=relaxed/simple; bh=i1yN7/D47SaLpCixDV1krhD1Lnr/bNLATK25Zr1s8fs=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=bq1ClDfmikJM7DL0Gg+YRMrvq81p2YvpMtvGqk/TSwnFj1gwIWm/i7+0r6Qd/jahP9dJql9iYiqSQ8vvMiVP4Rr4SEs1+2sxJI9q8kwEw0IsnhCO8L6tT6TNzD515QOf0H5ws6BC47vQxyVkNMqVgHVmk68hZ9oC/LfQfnfmFjs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=pm.me; spf=pass smtp.mailfrom=pm.me; dkim=pass (2048-bit key) header.d=pm.me header.i=@pm.me header.b=Q0WZEpgU; arc=none smtp.client-ip=185.70.40.133 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=pm.me Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pm.me Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=pm.me header.i=@pm.me header.b="Q0WZEpgU" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pm.me; s=protonmail3; t=1730351170; x=1730610370; bh=FPVsN+dpkjuPzI93fmpmkajfAMhILun+V5LsX4KFflg=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=Q0WZEpgUTK7UmLjocN9aBrQnAZ+rXPr7FjFSfIBFAd4QojpiaSJymkd7aD2tFNsHL 0mo88havjRGdySDGLOjD27a+5ki4HWQ2OA/JYMKwLTzDHa1+r5M0QNZbbk6S/j64wa e6NTSJj6HDzjHbRhLl80muplrZ0zYzrBjpobmvu2plJVHtXK7juntExiqmZcQt4Uwf KUdeVNadAcKfC7PiZTrU4oBovx9IRf631ZubvYbss1PS8YlUgUOh/VolqYgjK2+7hT nl2R3Sh3db0BlYjr3rrQQBaOLJQbgloutOjLr90xJKaEF+9tXkiMaz2joT+JVqR7eQ jFfYitiRkM5Sw== Date: Thu, 31 Oct 2024 05:06:06 +0000 To: git@vger.kernel.org From: Caleb White Cc: Taylor Blau , Phillip Wood , Junio C Hamano , Eric Sunshine , Caleb White Subject: [PATCH v3 6/8] worktree: add relative cli/config options to `move` command Message-ID: <20241031-wt_relative_options-v3-6-3e44ccdf64e6@pm.me> In-Reply-To: <20241031-wt_relative_options-v3-0-3e44ccdf64e6@pm.me> References: <20241031-wt_relative_options-v3-0-3e44ccdf64e6@pm.me> Feedback-ID: 31210263:user:proton X-Pm-Message-ID: c4332f4a9264fcf4765fcdc33f87f99f1e34551a Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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 --- builtin/worktree.c | 4 +++- t/t2403-worktree-move.sh | 22 ++++++++++++++++++++++ worktree.c | 23 ++++++++++------------- worktree.h | 3 ++- 4 files changed, 37 insertions(+), 15 deletions(-) diff --git a/builtin/worktree.c b/builtin/worktree.c index e3b4a71ee0bc13d5e817cf7dcc398e9e2bd975de..302151506981718658db1cd338cd9064688f5c14 100644 --- 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..6ce9ed3f1e6b3f73d2a290e770233eec30221fe5 100755 --- a/t/t2403-worktree-move.sh +++ b/t/t2403-worktree-move.sh @@ -247,4 +247,26 @@ test_expect_success 'not remove a repo with initialized submodule' ' ) ' +test_expect_success 'move worktree with absolute path to relative path' ' + git config worktree.useRelativePaths false && + git worktree add ./absolute && + git worktree move --relative-paths absolute relative && + cat relative/.git >actual && + echo "gitdir: ../.git/worktrees/absolute" >expect && + test_cmp expect actual && + git config worktree.useRelativePaths true && + git worktree move relative relative2 && + cat relative2/.git >actual && + echo "gitdir: ../.git/worktrees/absolute" >expect && + test_cmp expect actual +' + +test_expect_success 'move worktree with relative path to absolute path' ' + git config worktree.useRelativePaths true && + git worktree move --no-relative-paths relative2 absolute && + cat absolute/.git >actual && + echo "gitdir: $(pwd)/.git/worktrees/absolute" >expect && + test_cmp expect actual +' + test_done diff --git a/worktree.c b/worktree.c index ab6f1e036fa019285a1a5152decb9aed5202909f..6b640cd9549ecb060236f7eddf1390caa181f1a0 100644 --- a/worktree.c +++ b/worktree.c @@ -376,32 +376,29 @@ int validate_worktree(const struct worktree *wt, struct strbuf *errmsg, 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 4786aa545ca1fa12bb16a55ddf5a59c06503b2c5..6dd5dfc9b71870320c96aae35a7a983b5b9ba9a7 100644 --- a/worktree.h +++ b/worktree.h @@ -118,7 +118,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_); + const char *path_, + int use_relative_paths); typedef void (* worktree_repair_fn)(int iserr, const char *path, const char *msg, void *cb_data);