Skip to content

Commit ee79705

Browse files
derrickstoleegitster
authored andcommitted
commit-graph: parse commit from chosen graph
Before verifying a commit-graph file against the object database, we need to parse all commits from the given commit-graph file. Create parse_commit_in_graph_one() to target a given struct commit_graph. Signed-off-by: Derrick Stolee <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 0e3b97c commit ee79705

File tree

1 file changed

+15
-3
lines changed

1 file changed

+15
-3
lines changed

commit-graph.c

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -314,17 +314,29 @@ static int find_commit_in_graph(struct commit *item, struct commit_graph *g, uin
314314
}
315315
}
316316

317-
int parse_commit_in_graph(struct commit *item)
317+
static int parse_commit_in_graph_one(struct commit_graph *g, struct commit *item)
318318
{
319319
uint32_t pos;
320320

321321
if (!core_commit_graph)
322322
return 0;
323323
if (item->object.parsed)
324324
return 1;
325+
326+
if (find_commit_in_graph(item, g, &pos))
327+
return fill_commit_in_graph(item, g, pos);
328+
329+
return 0;
330+
}
331+
332+
int parse_commit_in_graph(struct commit *item)
333+
{
334+
if (!core_commit_graph)
335+
return 0;
336+
325337
prepare_commit_graph();
326-
if (commit_graph && find_commit_in_graph(item, commit_graph, &pos))
327-
return fill_commit_in_graph(item, commit_graph, pos);
338+
if (commit_graph)
339+
return parse_commit_in_graph_one(commit_graph, item);
328340
return 0;
329341
}
330342

0 commit comments

Comments
 (0)