From: Junio C Hamano Date: Fri, 13 Mar 2026 21:42:07 GMT Subject: Re: [PATCH 3/3] worktree: reject NULL worktree in get_worktree_git_dir() Message-ID: In-Reply-To: <1151b5b302069b4f3414a37e3be4bdbbc7e40686.1773411586.git.phillip.wood@dunelm.org.uk> Phillip Wood writes: > From: Phillip Wood > > This removes the final dependence on "the_repository" in > get_worktree_git_dir(). The last commit removed only caller that > passed a NULL worktree. > > get_worktree_git_dir() has the following callers: > > - branch.c:prepare_checked_out_branches() which loops over all > worktrees. > > - builtin/fsck.c:cmd_fsck() which loops over all worktrees. > > - builtin/receive-pack.c:update_worktree() which is called from > update() only when "worktree" is non-NULL. > > - builtin/worktree.c:validate_no_submodules() which is called from > check_clean_worktree() and move_worktree(), both of which supply > a non-NULL worktree. > > - reachable.c:add_rebase_files() which loops over all worktrees. > > - revision.c:add_index_objects_to_pending() which loops over all > worktrees. > > - worktree.c:is_current_worktree() which expects a non-NULL worktree. > > Signed-off-by: Phillip Wood > --- > worktree.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/worktree.c b/worktree.c > index 344ad0c031b..1ed5e8c3cd2 100644 > --- a/worktree.c > +++ b/worktree.c > @@ -227,7 +227,7 @@ struct worktree **get_worktrees_without_reading_head(void) > char *get_worktree_git_dir(const struct worktree *wt) > { > if (!wt) > - return xstrdup(repo_get_git_dir(the_repository)); > + BUG("%s() called with NULL worktree", __func__); > else if (!wt->id) > return xstrdup(repo_get_common_dir(wt->repo)); > else still has /* * 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); which needs a matching adjustment.