Re: [PATCH 1/2] wt-status: avoid passing NULL worktree
- From
- Phillip Wood <phillip.wood123@gmail.com>
- Date
- Feb 17, 2026, 09:23 UTC
- Message-ID
- <89c78ce2-1783-416d-9ae5-ef51f6bde58d@gmail.com>
- In-Reply-To
- <409871a7d521b76c9eb811d3c49747e04de8defc.1771258688.git.phillip.wood@dunelm.org.uk>
On 16/02/2026 16:18, Phillip Wood wrote:
Show 13 quoted lines
>
> +struct worktree *get_worktree_from_repository(struct repository *repo)
> +{
> + struct worktree *wt = xcalloc(1, sizeof(*wt));
> + char *gitdir = absolute_pathdup(repo->gitdir);
> + char *commondir = absolute_pathdup(repo->commondir);
> +
> + wt->repo = repo;
> + if (repo->worktree)
> + wt->path = absolute_pathdup(repo->worktree);
> + wt->is_bare = !!repo->worktree;
> + if (fspathcmp(gitdir, commondir))
> + wt->id = xstrdup(find_last_dir_sep(commondir) + 1);Oops s/commondir/gitdir/ - I'll wait to see if there are any other comments before re-rolling (perhaps with a test that runs git status on a rebase in a linked worktree)
Thanks
Phillip
Show 83 quoted lines
> + wt->is_current = is_current_worktree(wt);
> + add_head_info(wt);
> +
> + free(gitdir);
> + free(commondir);
> + return wt;
> +}
> +
> /*
> * When in a secondary worktree, and when extensions.worktreeConfig
> * is true, only $commondir/config and $commondir/worktrees/<id>/
> diff --git a/worktree.h b/worktree.h
> index e4bcccdc0ae..b162bbabd50 100644
> --- a/worktree.h
> +++ b/worktree.h
> @@ -38,7 +38,10 @@ struct worktree **get_worktrees(void);
> */
> struct worktree **get_worktrees_without_reading_head(void);
>
> -/*
> +/* Construct a struct worktree from a struct repository */
> +struct worktree *get_worktree_from_repository(struct repository *repo);
> +
> + /*
> * Returns 1 if linked worktrees exist, 0 otherwise.
> */
> int submodule_uses_worktrees(const char *path);
> diff --git a/wt-status.c b/wt-status.c
> index 95942399f8c..2debda534c1 100644
> --- a/wt-status.c
> +++ b/wt-status.c
> @@ -1747,6 +1747,9 @@ int wt_status_check_rebase(const struct worktree *wt,
> {
> struct stat st;
>
> + if (!wt)
> + BUG("wt_status_check_rebase() called with NULL worktree");
> +
> if (!stat(worktree_git_path(the_repository, wt, "rebase-apply"), &st)) {
> if (!stat(worktree_git_path(the_repository, wt, "rebase-apply/applying"), &st)) {
> state->am_in_progress = 1;
> @@ -1774,6 +1777,9 @@ int wt_status_check_bisect(const struct worktree *wt,
> {
> struct stat st;
>
> + if (!wt)
> + BUG("wt_status_check_bisect() called with NULL worktree");
> +
> if (!stat(worktree_git_path(the_repository, wt, "BISECT_LOG"), &st)) {
> state->bisect_in_progress = 1;
> state->bisecting_from = get_branch(wt, "BISECT_START");
> @@ -1819,18 +1825,19 @@ void wt_status_get_state(struct repository *r,
> struct stat st;
> struct object_id oid;
> enum replay_action action;
> + struct worktree *wt = get_worktree_from_repository(r);
>
> if (!stat(git_path_merge_head(r), &st)) {
> - wt_status_check_rebase(NULL, state);
> + wt_status_check_rebase(wt, state);
> state->merge_in_progress = 1;
> - } else if (wt_status_check_rebase(NULL, state)) {
> + } else if (wt_status_check_rebase(wt, state)) {
> ; /* all set */
> } else if (refs_ref_exists(get_main_ref_store(r), "CHERRY_PICK_HEAD") &&
> !repo_get_oid(r, "CHERRY_PICK_HEAD", &oid)) {
> state->cherry_pick_in_progress = 1;
> oidcpy(&state->cherry_pick_head_oid, &oid);
> }
> - wt_status_check_bisect(NULL, state);
> + wt_status_check_bisect(wt, state);
> if (refs_ref_exists(get_main_ref_store(r), "REVERT_HEAD") &&
> !repo_get_oid(r, "REVERT_HEAD", &oid)) {
> state->revert_in_progress = 1;
> @@ -1848,6 +1855,8 @@ void wt_status_get_state(struct repository *r,
> if (get_detached_from)
> wt_status_get_detached_from(r, state);
> wt_status_check_sparse_checkout(r, state);
> +
> + free_worktree(wt);
> }
>
> static void wt_longstatus_print_state(struct wt_status *s)