Skip to content

Commit a1d9003

Browse files
committed
Merge branch 'ps/commit-graph-per-object-source' into seen
* ps/commit-graph-per-object-source: odb: move commit-graph into the object sources commit-graph: pass graphs that are to be merged as parameter commit-graph: return commit graph from `repo_find_commit_pos_in_graph()` commit-graph: return the prepared commit graph from `prepare_commit_graph()` revision: drop explicit check for commit graph blame: drop explicit check for commit graph
2 parents f7b1295 + 7cd9bdf commit a1d9003

8 files changed

Lines changed: 118 additions & 109 deletions

File tree

blame.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2909,9 +2909,6 @@ void setup_blame_bloom_data(struct blame_scoreboard *sb)
29092909
struct blame_bloom_data *bd;
29102910
struct bloom_filter_settings *bs;
29112911

2912-
if (!sb->repo->objects->commit_graph)
2913-
return;
2914-
29152912
bs = get_bloom_filter_settings(sb->repo);
29162913
if (!bs)
29172914
return;

bloom.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -452,10 +452,12 @@ struct bloom_filter *get_or_compute_bloom_filter(struct repository *r,
452452
filter = bloom_filter_slab_at(&bloom_filters, c);
453453

454454
if (!filter->data) {
455+
struct commit_graph *g;
455456
uint32_t graph_pos;
456-
if (repo_find_commit_pos_in_graph(r, c, &graph_pos))
457-
load_bloom_filter_from_graph(r->objects->commit_graph,
458-
filter, graph_pos);
457+
458+
g = repo_find_commit_pos_in_graph(r, c, &graph_pos);
459+
if (g)
460+
load_bloom_filter_from_graph(g, filter, graph_pos);
459461
}
460462

461463
if (filter->data && filter->len) {

0 commit comments

Comments
 (0)