Always use oidread to read into struct object_id

[thirdparty/git.git] / commit-graph.c

diff --git a/commit-graph.c b/commit-graph.c
index f18380b922c12208cbceae92fce98e2e6b42e6ed..23fef56d3112dc5701754fbea5fe821ba3100a96 100644 (file)
--- a/commit-graph.c
+++ b/commit-graph.c
@@ -425,7 +425,7 @@ struct commit_graph *parse_commit_graph(struct repository *r,
                FREE_AND_NULL(graph->bloom_filter_settings);
        }
 
-       hashcpy(graph->oid.hash, graph->data + graph->data_len - graph->hash_len);
+       oidread(&graph->oid, graph->data + graph->data_len - graph->hash_len);
 
        if (verify_commit_graph_lite(graph))
                goto free_and_return;
@@ -746,7 +746,7 @@ static void load_oid_from_graph(struct commit_graph *g,
 
        lex_index = pos - g->num_commits_in_base;
 
-       hashcpy(oid->hash, g->chunk_oid_lookup + g->hash_len * lex_index);
+       oidread(oid, g->chunk_oid_lookup + g->hash_len * lex_index);
 }
 
 static struct commit_list **insert_parent_or_die(struct repository *r,
@@ -939,7 +939,7 @@ static struct tree *load_tree_for_commit(struct repository *r,
        commit_data = g->chunk_commit_data +
                        GRAPH_DATA_WIDTH * (graph_pos - g->num_commits_in_base);
 
-       hashcpy(oid.hash, commit_data);
+       oidread(&oid, commit_data);
        set_commit_tree(c, lookup_tree(r, &oid));
 
        return c->maybe_tree;
@@ -2322,7 +2322,7 @@ int write_commit_graph(struct object_directory *odb,
                struct commit_graph *g = ctx->r->objects->commit_graph;
                for (i = 0; i < g->num_commits; i++) {
                        struct object_id oid;
-                       hashcpy(oid.hash, g->chunk_oid_lookup + g->hash_len * i);
+                       oidread(&oid, g->chunk_oid_lookup + g->hash_len * i);
                        oid_array_append(&ctx->oids, &oid);
                }
        }
@@ -2453,7 +2453,7 @@ int verify_commit_graph(struct repository *r, struct commit_graph *g, int flags)
        for (i = 0; i < g->num_commits; i++) {
                struct commit *graph_commit;
 
-               hashcpy(cur_oid.hash, g->chunk_oid_lookup + g->hash_len * i);
+               oidread(&cur_oid, g->chunk_oid_lookup + g->hash_len * i);
 
                if (i && oidcmp(&prev_oid, &cur_oid) >= 0)
                        graph_report(_("commit-graph has incorrect OID order: %s then %s"),
@@ -2501,7 +2501,7 @@ int verify_commit_graph(struct repository *r, struct commit_graph *g, int flags)
                timestamp_t generation;
 
                display_progress(progress, i + 1);
-               hashcpy(cur_oid.hash, g->chunk_oid_lookup + g->hash_len * i);
+               oidread(&cur_oid, g->chunk_oid_lookup + g->hash_len * i);
 
                graph_commit = lookup_commit(r, &cur_oid);
                odb_commit = (struct commit *)create_object(r, &cur_oid, alloc_commit_node(r));