git-for-windows/git
1
0
Fork 0
mirror of https://github.com/git-for-windows/git.git synced 2026-04-22 14:20:10 -05:00
Code Issues Packages Projects Releases 335 Wiki Activity

Revert "Merge branch 'tb/commit-graph-verify-fix' into next"

Browse Source 
This reverts commit ba45da55f5, reversing
changes made to 16b87e890a.
This commit is contained in:
Junio C Hamano
2023-08-21 16:24:02 -07:00
parent 07331710b8
commit 6c8a98e0b6
2 changed files with 11 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
commit-graph.c
View File

@@ -128,16 +128,6 @@ timestamp_t commit_graph_generation(const struct commit *c)
return GENERATION_NUMBER_INFINITY;
}
static timestamp_t commit_graph_generation_from_graph(const struct commit *c)
{
struct commit_graph_data *data =
commit_graph_data_slab_peek(&commit_graph_data_slab, c);
if (!data || data->graph_pos == COMMIT_NOT_FROM_GRAPH)
return GENERATION_NUMBER_INFINITY;
return data->generation;
}
static struct commit_graph_data *commit_graph_data_at(const struct commit *c)
{
unsigned int i, nth_slab;
@@ -2690,7 +2680,7 @@ static int verify_one_commit_graph(struct repository *r,
oid_to_hex(&graph_parents->item->object.oid),
oid_to_hex(&odb_parents->item->object.oid));
generation = commit_graph_generation_from_graph(graph_parents->item);
generation = commit_graph_generation(graph_parents->item);
if (generation > max_generation)
max_generation = generation;
@@ -2702,17 +2692,14 @@ static int verify_one_commit_graph(struct repository *r,
graph_report(_("commit-graph parent list for commit %s terminates early"),
oid_to_hex(&cur_oid));
if (commit_graph_generation_from_graph(graph_commit)) {
if (generation_zero == GENERATION_ZERO_EXISTS)
graph_report(_("commit-graph has non-zero generation number for commit %s, but zero elsewhere"),
oid_to_hex(&cur_oid));
generation_zero = GENERATION_NUMBER_EXISTS;
} else {
if (!commit_graph_generation(graph_commit)) {
if (generation_zero == GENERATION_NUMBER_EXISTS)
graph_report(_("commit-graph has generation number zero for commit %s, but non-zero elsewhere"),
oid_to_hex(&cur_oid));
generation_zero = GENERATION_ZERO_EXISTS;
}
} else if (generation_zero == GENERATION_ZERO_EXISTS)
graph_report(_("commit-graph has non-zero generation number for commit %s, but zero elsewhere"),
oid_to_hex(&cur_oid));
if (generation_zero == GENERATION_ZERO_EXISTS)
continue;