Merge branch 'ak/commit-graph-to-slab'

[thirdparty/git.git] / bloom.c

diff --git a/bloom.c b/bloom.c
index 6c7611847ad05cb95103177ca00e7824f42b63c1..6a7f2f2bdc13031f2861a5cd8c8417bafaed503f 100644 (file)
--- a/bloom.c
+++ b/bloom.c
@@ -33,15 +33,16 @@ static int load_bloom_filter_from_graph(struct commit_graph *g,
                                        struct commit *c)
 {
        uint32_t lex_pos, start_index, end_index;
+       uint32_t graph_pos = commit_graph_position(c);
 
-       while (c->graph_pos < g->num_commits_in_base)
+       while (graph_pos < g->num_commits_in_base)
                g = g->base_graph;
 
        /* The commit graph commit 'c' lives in doesn't carry bloom filters. */
        if (!g->chunk_bloom_indexes)
                return 0;
 
-       lex_pos = c->graph_pos - g->num_commits_in_base;
+       lex_pos = graph_pos - g->num_commits_in_base;
 
        end_index = get_be32(g->chunk_bloom_indexes + 4 * lex_pos);
 
@@ -193,7 +194,7 @@ struct bloom_filter *get_bloom_filter(struct repository *r,
 
        if (!filter->data) {
                load_commit_graph_info(r, c);
-               if (c->graph_pos != COMMIT_NOT_FROM_GRAPH &&
+               if (commit_graph_position(c) != COMMIT_NOT_FROM_GRAPH &&
                        r->objects->commit_graph->chunk_bloom_indexes) {
                        if (load_bloom_filter_from_graph(r->objects->commit_graph, filter, c))
                                return filter;