Re: [PATCH V2 0/3] wt-status: reduce reliance on global state
- From
- Phillip Wood <phillip.wood123@gmail.com>
- Date
- Feb 5, 2026, 15:53 UTC
- Message-ID
- <16274976-17c0-499b-8225-de2d783ed343@gmail.com>
- In-Reply-To
- <20260205102815.134373-1-shreyanshpaliwalcmsmn@gmail.com>
On 05/02/2026 10:27, Shreyansh Paliwal wrote:
Show 7 quoted lines
> I forgot to include the changes in the version. > > Changes in V2, > - Explained the changes and the reason more elaborately in commit message. > - Passed struct repository instead of accessing struct worktree in > wt_status_check_rebase() and shifted this change to patch 2/3 instead of 1/3. > - Added information about leftover globals in the cover.
As well as describing the changes it is very helpful to include a range-diff to show what's changed - see the --range-diff option to "git format-patch". I've pasted the range-diff between V1 and V2 below
Thanks
Phillip
1: 1bf5449c7a8 ! 1: 7285c64e672 wt-status: replace uses of the_repository with local repository instances
@@ Metadata
## Commit message ##
wt-status: replace uses of the_repository with local repository instances
- Many instances of the_repository are used in wt-status.c even when a
- local repository is already available via struct wt_status or struct
- worktree.
-
- Replace direct uses of the global the_repository with the repository
- instance carried by the local structs (e.g. s->repo, wt->repo).
-
- This helps reduce reliance on global repository state.
+ wt-status.c uses the global the_repository in several places even when
+ a repository instance is already available via struct wt_status or
+ struct worktree.
+
+ Replace these direct uses of the_repository with the repository carried
+ by the local structs (e.g. s->repo, wt->repo).
+
+ The replacements of all the_repository with s->repo are mostly
+ to cases where a repository instance is already available via
+ struct wt_status. All functions operating on struct wt_status *s
+ are only used after s is initialized by wt_status_prepare(),
+ which sets s->repo from the repository provided by the caller.
+ As a result, s->repo is guaranteed to be available and consistent
+ whenever these functions are invoked.
+
+ This reduces reliance on global state and keeps wt-status consistent,
+ though many functions operating on struct wt_status *s
+ are called via commit.c and it still relies on the_repository,
+ but within wt-status.c the local repository pointer
+ refers to the same underlying repository object.
Signed-off-by: Shreyansh Paliwal <shreyanshpaliwalcmsmn@gmail.com>
@@ wt-status.c: void wt_status_prepare(struct repository *r, struct wt_status *s)
s->use_color = GIT_COLOR_UNKNOWN;
s->relative_paths = 1;
- s->branch = refs_resolve_refdup(get_main_ref_store(the_repository),
-+ s->branch = refs_resolve_refdup(get_main_ref_store(s->repo),
++ s->branch = refs_resolve_refdup(get_main_ref_store(r),
"HEAD", 0, NULL, NULL);
s->reference = "HEAD";
s->fp = stdout;
@@ wt-status.c: static void wt_status_get_detached_from(struct repository *r,
strbuf_release(&cb.buf);
return;
}
-@@ wt-status.c: int wt_status_check_rebase(const struct worktree *wt,
- {
- struct stat st;
-
-- if (!stat(worktree_git_path(the_repository, wt, "rebase-apply"), &st)) {
-- if (!stat(worktree_git_path(the_repository, wt, "rebase-apply/applying"), &st)) {
-+ if (!stat(worktree_git_path(wt->repo, wt, "rebase-apply"), &st)) {
-+ if (!stat(worktree_git_path(wt->repo, wt, "rebase-apply/applying"), &st)) {
- state->am_in_progress = 1;
-- if (!stat(worktree_git_path(the_repository, wt, "rebase-apply/patch"), &st) && !st.st_size)
-+ if (!stat(worktree_git_path(wt->repo, wt, "rebase-apply/patch"), &st) && !st.st_size)
- state->am_empty_patch = 1;
- } else {
- state->rebase_in_progress = 1;
- state->branch = get_branch(wt, "rebase-apply/head-name");
- state->onto = get_branch(wt, "rebase-apply/onto");
- }
-- } else if (!stat(worktree_git_path(the_repository, wt, "rebase-merge"), &st)) {
-- if (!stat(worktree_git_path(the_repository, wt, "rebase-merge/interactive"), &st))
-+ } else if (!stat(worktree_git_path(wt->repo, wt, "rebase-merge"), &st)) {
-+ if (!stat(worktree_git_path(wt->repo, wt, "rebase-merge/interactive"), &st))
- state->rebase_interactive_in_progress = 1;
- else
- state->rebase_in_progress = 1;
@@ wt-status.c: int wt_status_check_bisect(const struct worktree *wt,
{
struct stat st;
2: 8a0b489c3be ! 2: 0a04c957f12 wt-status: pass struct repository and wt_status through function parameters
@@ Commit message
Some functions in wt-status.c relied on the_repository because no
repository instance was available in their local scope.
-
- Update these functions to accept struct repository or struct
- wt_status as parameters, and adjust callers accordingly.
-
- Replace remaining uses of the_repository in these functions with the
+ There is also a specific case in wt_status_check_rebase() where the
+ worktree can be NULL, so accessing wt->repo may lead to a segfault.
+
+ Update these functions to accept a struct repository or struct
+ wt_status parameter, and adjust callers accordingly. Replace the
+ remaining uses of the_repository in these functions with the
passed-in repository instance.
- This completely removes the use of the_repository global variable
- in wt-status.c.
+ This removes the use of the_repository global variable from
+ wt-status.c completely.
Signed-off-by: Shreyansh Paliwal <shreyanshpaliwalcmsmn@gmail.com>
+ ## branch.c ##
+@@ branch.c: static void prepare_checked_out_branches(void)
+ free(old);
+ }
+
+- if (wt_status_check_rebase(wt, &state) &&
++ if (wt_status_check_rebase(wt->repo, wt, &state) &&
+ (state.rebase_in_progress || state.rebase_interactive_in_progress) &&
+ state.branch) {
+ struct strbuf ref = STRBUF_INIT;
+
+ ## worktree.c ##
+@@ worktree.c: int is_worktree_being_rebased(const struct worktree *wt,
+ int found_rebase;
+
+ memset(&state, 0, sizeof(state));
+- found_rebase = wt_status_check_rebase(wt, &state) &&
++ found_rebase = wt_status_check_rebase(wt->repo, wt, &state) &&
+ (state.rebase_in_progress ||
+ state.rebase_interactive_in_progress) &&
+ state.branch &&
+
## wt-status.c ##
@@ wt-status.c: static int stash_count_refs(const char *refname UNUSED,
return 0;
@@ wt-status.c: static void show_rebase_information(struct wt_status *s,
&yet_to_do))
status_printf_ln(s, color,
_("git-rebase-todo is missing."));
+@@ wt-status.c: static void wt_status_get_detached_from(struct repository *r,
+ strbuf_release(&cb.buf);
+ }
+
+-int wt_status_check_rebase(const struct worktree *wt,
+- struct wt_status_state *state)
++int wt_status_check_rebase(struct repository *r,
++ const struct worktree *wt,
++ struct wt_status_state *state)
+ {
+ struct stat st;
+
+- if (!stat(worktree_git_path(the_repository, wt, "rebase-apply"), &st)) {
+- if (!stat(worktree_git_path(the_repository, wt, "rebase-apply/applying"), &st)) {
++ if (!stat(worktree_git_path(r, wt, "rebase-apply"), &st)) {
++ if (!stat(worktree_git_path(r, wt, "rebase-apply/applying"), &st)) {
+ state->am_in_progress = 1;
+- if (!stat(worktree_git_path(the_repository, wt, "rebase-apply/patch"), &st) && !st.st_size)
++ if (!stat(worktree_git_path(r, wt, "rebase-apply/patch"), &st) && !st.st_size)
+ state->am_empty_patch = 1;
+ } else {
+ state->rebase_in_progress = 1;
+ state->branch = get_branch(wt, "rebase-apply/head-name");
+ state->onto = get_branch(wt, "rebase-apply/onto");
+ }
+- } else if (!stat(worktree_git_path(the_repository, wt, "rebase-merge"), &st)) {
+- if (!stat(worktree_git_path(the_repository, wt, "rebase-merge/interactive"), &st))
++ } else if (!stat(worktree_git_path(r, wt, "rebase-merge"), &st)) {
++ if (!stat(worktree_git_path(r, wt, "rebase-merge/interactive"), &st))
+ state->rebase_interactive_in_progress = 1;
+ else
+ state->rebase_in_progress = 1;
+@@ wt-status.c: void wt_status_get_state(struct repository *r,
+ enum replay_action action;
+
+ if (!stat(git_path_merge_head(r), &st)) {
+- wt_status_check_rebase(NULL, state);
++ wt_status_check_rebase(r, NULL, state);
+ state->merge_in_progress = 1;
+- } else if (wt_status_check_rebase(NULL, state)) {
++ } else if (wt_status_check_rebase(r, NULL, state)) {
+ ; /* all set */
+ } else if (refs_ref_exists(get_main_ref_store(r), "CHERRY_PICK_HEAD") &&
+ !repo_get_oid(r, "CHERRY_PICK_HEAD", &oid)) {
@@ wt-status.c: static void wt_porcelain_v2_print_tracking(struct wt_status *s)
*/
static void wt_porcelain_v2_print_stash(struct wt_status *s)
@@ wt-status.c: static void wt_porcelain_v2_print_tracking(struct wt_status *s)
char eol = s->null_termination ? '\0' : '\n';
if (stash_count > 0)
+
+ ## wt-status.h ##
+@@ wt-status.h: void wt_status_state_free_buffers(struct wt_status_state *s);
+ void wt_status_get_state(struct repository *repo,
+ struct wt_status_state *state,
+ int get_detached_from);
+-int wt_status_check_rebase(const struct worktree *wt,
+- struct wt_status_state *state);
++int wt_status_check_rebase(struct repository *r,
++ const struct worktree *wt,
++ struct wt_status_state *state);
+ int wt_status_check_bisect(const struct worktree *wt,
+ struct wt_status_state *state);
+
3: e2cf365bad5 ! 3: 74b28d95299 wt-status: use hash_algo from local repository instead of global the_hash_algo
@@ Metadata
## Commit message ##
wt-status: use hash_algo from local repository instead of global the_hash_algo
- wt-status.c uses the global the_hash_algo even though a repository
- instance is already available via struct repository *r.
+ wt-status.c still uses the global the_hash_algo even though a repository
+ instance is already available via struct wt_status.
Replace uses of the_hash_algo with the hash algorithm stored in the
- associated repository (r->hash_algo).
+ associated repository (s->repo->hash_algo or r->hash_algo).
This removes another dependency on global state and keeps wt-status
consistent with local repository usage.