dilim/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-08-04 15:11:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'kk/commit-graph-topo-levels-fix'

Browse Source 
The 'topo_levels' slab was propagated only to the topmost layer of a
split commit-graph chain, causing topological levels for commits in
base layers to be recomputed during incremental writes.  This has been
corrected.

* kk/commit-graph-topo-levels-fix:
  commit-graph: propagate topo_levels slab to all chain layers
  commit-graph: add trace2 instrumentation for generation DFS
This commit is contained in:
Junio C Hamano
2026-07-19 10:42:19 -07:00
parent a336bfa205 8ea36f63d8
commit 82c60a874d
2 changed files with 30 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
commit-graph.c
View File

@@ -1653,6 +1653,7 @@ static void compute_reachable_generation_numbers(
{
int i;
struct commit_list *list = NULL;
intmax_t steps = 0;
for (i = 0; i < info->commits->nr; i++) {
struct commit *c = info->commits->items[i];
@@ -1671,6 +1672,7 @@ static void compute_reachable_generation_numbers(
int all_parents_computed = 1;
timestamp_t max_gen = 0;
steps++;
for (parent = current->parents; parent; parent = parent->next) {
repo_parse_commit(info->r, parent->item);
gen = info->get_generation(parent->item, info->data);
@@ -1694,6 +1696,9 @@ static void compute_reachable_generation_numbers(
}
}
}
trace2_data_intmax("commit-graph", info->r,
"generation-dfs-steps", steps);
}
static timestamp_t get_topo_level(struct commit *c, void *data)
@@ -2605,7 +2610,7 @@ int write_commit_graph(struct odb_source *source,
g = prepare_commit_graph(ctx.r);
for (struct commit_graph *chain = g; chain; chain = chain->base_graph)
g->topo_levels = &topo_levels;
chain->topo_levels = &topo_levels;
if (flags & COMMIT_GRAPH_WRITE_BLOOM_FILTERS)
ctx.changed_paths = 1;

24
t/t5324-split-commit-graph.sh
View File

@@ -718,6 +718,30 @@ test_expect_success 'write generation data chunk when commit-graph chain is repl
)
'
test_expect_success 'incremental write reads topo levels from all layers' '
git init topo-from-lower &&
(
cd topo-from-lower &&
for i in $(test_seq 5)
do
test_commit base-$i || return 1
done &&
git commit-graph write --reachable &&
test_commit extra &&
git commit-graph write --reachable --split=no-merge &&
git checkout base-3 &&
test_commit new-branch &&
GIT_TRACE2_EVENT="$(pwd)/trace.txt" \
git commit-graph write --reachable --split=no-merge &&
test_trace2_data commit-graph generation-dfs-steps 1 <trace.txt
)
'
test_expect_success 'temporary graph layer is discarded upon failure' '
git init layer-discard &&
(