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 <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/commit-graph.c b/commit-graph.c
index f83f6d2373af6b356295ee1686a8813695801723..e77b19971d9e733392220cb1964abb21a58e5232 100644 (file)
--- a/commit-graph.c
+++ b/commit-graph.c
@@ -314,7 +314,7 @@ static int find_commit_in_graph(struct commit *item, struct commit_graph *g, uin
        }
 }
 
        }
 }
 

-int parse_commit_in_graph(struct commit *item)
+static int parse_commit_in_graph_one(struct commit_graph *g, struct commit *item)

 {
        uint32_t pos;
 
 {
        uint32_t pos;
 


@@ -322,9 +322,21 @@ int parse_commit_in_graph(struct commit *item)
                return 0;
        if (item->object.parsed)
                return 1;
                return 0;
        if (item->object.parsed)
                return 1;

+
+       if (find_commit_in_graph(item, g, &pos))
+               return fill_commit_in_graph(item, g, pos);
+
+       return 0;
+}
+
+int parse_commit_in_graph(struct commit *item)
+{
+       if (!core_commit_graph)
+               return 0;
+

        prepare_commit_graph();
        prepare_commit_graph();

-       if (commit_graph && find_commit_in_graph(item, commit_graph, &pos))
-               return fill_commit_in_graph(item, commit_graph, pos);
+       if (commit_graph)
+               return parse_commit_in_graph_one(commit_graph, item);

        return 0;
 }
 
        return 0;
 }