mirror of
https://github.com/git/git.git
synced 2026-03-02 11:36:26 +00:00
wt-status: use hash_algo from local repository instead of global the_hash_algo
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>
This commit is contained in:
committed by
Junio C Hamano
parent
9d0d2ba217
commit
a7cd24de0b
@@ -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, "");
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user