[PATCH v2 0/3] worktree: stop using "the_repository" in is_current_worktree()
- From
- Phillip Wood <phillip.wood123@gmail.com>
- Date
- Mar 15, 2026, 16:18 UTC
- Message-ID
- <cover.1773591528.git.phillip.wood@dunelm.org.uk>
- In-Reply-To
- <cover.1773411586.git.phillip.wood@dunelm.org.uk>
From: Phillip Wood <phillip.wood@dunelm.org.uk>
This is a follow up to pw/no-more-NULL-means-current-worktree that removes "the_repository" from is_current_worktree() and get_worktree_git_dir(). The first patch removes the use of "the_repository" when determining if a worktree is current. Patches 2 & 3 require a non-NULL worktree when calling get_worktree_git_dir() to remove the last use of "the_repository" in that function.
Changes since V1
- Patch 2: fixed indentation (thanks to Junio) - Patch 3: removed stale comment (thanks to Junio)
Base-Commit: 7f19e4e1b6a3ad259e2ed66033e01e03b8b74c5e Published-As: https://github.com/phillipwood/git/releases/tag/pw%2Fworktree-is-current-use-repo%2Fv2 View-Changes-At: https://github.com/phillipwood/git/compare/7f19e4e1b...75eecc849 Fetch-It-Via: git fetch https://github.com/phillipwood/git pw/worktree-is-current-use-repo/v2
Phillip Wood (3): worktree: remove "the_repository" from is_current_worktree() worktree add: stop reading ".git/HEAD" worktree: reject NULL worktree in get_worktree_git_dir()
builtin/worktree.c | 21 ++------------------- t/t2400-worktree-add.sh | 28 ++++++++++++---------------- worktree.c | 10 +++++----- worktree.h | 1 - 4 files changed, 19 insertions(+), 41 deletions(-)
Range-diff against v1:
1: 075700a2256 = 1: 075700a2256 worktree: remove "the_repository" from is_current_worktree()
2: ae2a368e7e7 ! 2: c3c5767725d worktree add: stop reading ".git/HEAD"
@@ builtin/worktree.c: static int can_use_local_refs(const struct add_opts *opts)
- free(wt_gitdir);
- }
+ if (!opts->quiet)
-+ warning(_("HEAD points to an invalid (or orphaned) reference.\n"));
++ warning(_("HEAD points to an invalid (or orphaned) reference.\n"));
return 1;
}
return 0;
3: 1151b5b3020 ! 3: 75eecc8492e worktree: reject NULL worktree in get_worktree_git_dir()
@@ worktree.c: struct worktree **get_worktrees_without_reading_head(void)
else if (!wt->id)
return xstrdup(repo_get_common_dir(wt->repo));
else
+
+ ## worktree.h ##
+@@ worktree.h: int submodule_uses_worktrees(const char *path);
+
+ /*
+ * Return git dir of the worktree. Note that the path may be relative.
+- * If wt is NULL, git dir of current worktree is returned.
+ */
+ char *get_worktree_git_dir(const struct worktree *wt);
+ -- 2.52.0.362.g884e03848a9