treewide: rename tree to maybe_tree

[thirdparty/git.git] / log-tree.c

diff --git a/log-tree.c b/log-tree.c
index bdf23c5f7b89eda2997057285d1fff64acb0d30c..99499af57c102f1d84f5c44ff0565a463f4486e5 100644 (file)
--- a/log-tree.c
+++ b/log-tree.c
@@ -806,7 +806,7 @@ static int log_tree_diff(struct rev_info *opt, struct commit *commit, struct log
                return 0;
 
        parse_commit_or_die(commit);
-       oid = &commit->tree->object.oid;
+       oid = &commit->maybe_tree->object.oid;
 
        /* Root commit? */
        parents = get_saved_parents(opt, commit);
@@ -831,7 +831,7 @@ static int log_tree_diff(struct rev_info *opt, struct commit *commit, struct log
                         * we merged _in_.
                         */
                        parse_commit_or_die(parents->item);
-                       diff_tree_oid(&parents->item->tree->object.oid,
+                       diff_tree_oid(&parents->item->maybe_tree->object.oid,
                                      oid, "", &opt->diffopt);
                        log_tree_diff_flush(opt);
                        return !opt->loginfo;
@@ -846,7 +846,7 @@ static int log_tree_diff(struct rev_info *opt, struct commit *commit, struct log
                struct commit *parent = parents->item;
 
                parse_commit_or_die(parent);
-               diff_tree_oid(&parent->tree->object.oid,
+               diff_tree_oid(&parent->maybe_tree->object.oid,
                              oid, "", &opt->diffopt);
                log_tree_diff_flush(opt);