summaryrefslogtreecommitdiff
path: root/commit.c
diff options
context:
space:
mode:
authorDerrick Stolee <dstolee@microsoft.com>2018-04-06 19:09:46 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-04-11 01:47:16 (GMT)
commit7b8a21dba1bce44d64bd86427d3d92437adc4707 (patch)
treee45261ae8a002fdd4bab8ffc632740b5cee55c8c /commit.c
parent2e27bd7731d47b374c1c14b53af07b3bfa39fcac (diff)
downloadgit-7b8a21dba1bce44d64bd86427d3d92437adc4707.zip
git-7b8a21dba1bce44d64bd86427d3d92437adc4707.tar.gz
git-7b8a21dba1bce44d64bd86427d3d92437adc4707.tar.bz2
commit-graph: lazy-load trees for commits
The commit-graph file provides quick access to commit data, including the OID of the root tree for each commit in the graph. When performing a deep commit-graph walk, we may not need to load most of the trees for these commits. Delay loading the tree object for a commit loaded from the graph until requested via get_commit_tree(). Do not lazy-load trees for commits not in the graph, since that requires duplicate parsing and the relative peformance improvement when trees are not needed is small. On the Linux repository, performance tests were run for the following command: git log --graph --oneline -1000 Before: 0.92s After: 0.66s Rel %: -28.3% Adding '-- kernel/' to the command requires loading the root tree for every commit that is walked. There was no measureable performance change as a result of this patch. Signed-off-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'commit.c')
-rw-r--r--commit.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/commit.c b/commit.c
index aea2ca1..711f674 100644
--- a/commit.c
+++ b/commit.c
@@ -298,7 +298,13 @@ void free_commit_buffer(struct commit *commit)
struct tree *get_commit_tree(const struct commit *commit)
{
- return commit->maybe_tree;
+ if (commit->maybe_tree || !commit->object.parsed)
+ return commit->maybe_tree;
+
+ if (commit->graph_pos == COMMIT_NOT_FROM_GRAPH)
+ BUG("commit has NULL tree, but was not loaded from commit-graph");
+
+ return get_commit_tree_in_graph(commit);
}
struct object_id *get_commit_tree_oid(const struct commit *commit)