]> git.ipfire.org Git - thirdparty/git.git/commitdiff
wt-status: use hash_algo from local repository instead of global the_hash_algo
authorShreyansh Paliwal <shreyanshpaliwalcmsmn@gmail.com>
Wed, 18 Feb 2026 17:53:42 +0000 (23:23 +0530)
committerJunio C Hamano <gitster@pobox.com>
Thu, 19 Feb 2026 16:59:24 +0000 (08:59 -0800)
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 (s->repo->hash_algo or r->hash_algo).

This removes another dependency on global state and keeps wt-status
consistent with local repository usage.

Signed-off-by: Shreyansh Paliwal <shreyanshpaliwalcmsmn@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
wt-status.c

index b44b8377e5be1259c7196a9ceac924d04a9db25b..264281fb6756f8e09babf733806c66d9d37b5334 100644 (file)
@@ -1815,10 +1815,10 @@ void wt_status_get_state(struct repository *r,
        if (!sequencer_get_last_command(r, &action)) {
                if (action == REPLAY_PICK && !state->cherry_pick_in_progress) {
                        state->cherry_pick_in_progress = 1;
-                       oidcpy(&state->cherry_pick_head_oid, null_oid(the_hash_algo));
+                       oidcpy(&state->cherry_pick_head_oid, null_oid(r->hash_algo));
                } else if (action == REPLAY_REVERT && !state->revert_in_progress) {
                        state->revert_in_progress = 1;
-                       oidcpy(&state->revert_head_oid, null_oid(the_hash_algo));
+                       oidcpy(&state->revert_head_oid, null_oid(r->hash_algo));
                }
        }
        if (get_detached_from)
@@ -2630,7 +2630,7 @@ int has_uncommitted_changes(struct repository *r,
                 * We have no head (or it's corrupt); use the empty tree,
                 * which will complain if the index is non-empty.
                 */
-               struct tree *tree = lookup_tree(r, the_hash_algo->empty_tree);
+               struct tree *tree = lookup_tree(r, r->hash_algo->empty_tree);
                add_pending_object(&rev_info, &tree->object, "");
        }