treewide: rename tree to maybe_tree
Using the commit-graph file to walk commit history removes the large cost of parsing commits during the walk. This exposes a performance issue: lookup_tree() takes a large portion of the computation time, even when Git never uses those trees. In anticipation of lazy-loading these trees, rename the 'tree' member of struct commit to 'maybe_tree'. This serves two purposes: it hints at the future role of possibly being NULL even if the commit has a valid tree, and it allows for unambiguous transformation from simple member access (i.e. commit->maybe_tree) to method access. Signed-off-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:

committed by
Junio C Hamano

parent
2d5792f071
commit
891435d55d
@ -439,8 +439,8 @@ static void file_change(struct diff_options *options,
|
||||
static int rev_compare_tree(struct rev_info *revs,
|
||||
struct commit *parent, struct commit *commit)
|
||||
{
|
||||
struct tree *t1 = parent->tree;
|
||||
struct tree *t2 = commit->tree;
|
||||
struct tree *t1 = parent->maybe_tree;
|
||||
struct tree *t2 = commit->maybe_tree;
|
||||
|
||||
if (!t1)
|
||||
return REV_TREE_NEW;
|
||||
@ -476,7 +476,7 @@ static int rev_compare_tree(struct rev_info *revs,
|
||||
static int rev_same_tree_as_empty(struct rev_info *revs, struct commit *commit)
|
||||
{
|
||||
int retval;
|
||||
struct tree *t1 = commit->tree;
|
||||
struct tree *t1 = commit->maybe_tree;
|
||||
|
||||
if (!t1)
|
||||
return 0;
|
||||
@ -614,7 +614,7 @@ static void try_to_simplify_commit(struct rev_info *revs, struct commit *commit)
|
||||
if (!revs->prune)
|
||||
return;
|
||||
|
||||
if (!commit->tree)
|
||||
if (!commit->maybe_tree)
|
||||
return;
|
||||
|
||||
if (!commit->parents) {
|
||||
|
Reference in New Issue
Block a user