treewide: replace maybe_tree with accessor methods

diff --git a/merge-recursive.c b/merge-recursive.c
index 0f75d75d1788aeba20d71347115add5ac1f5afdd..8de6e3652733860e3b63eaca9e4c1512fa3a19a3 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -2154,8 +2154,8 @@ int merge_recursive(struct merge_options *o,
                read_cache();
 
        o->ancestor = "merged common ancestors";
-       clean = merge_trees(o, h1->maybe_tree, h2->maybe_tree,
-                           merged_common_ancestors->maybe_tree,
+       clean = merge_trees(o, get_commit_tree(h1), get_commit_tree(h2),
+                           get_commit_tree(merged_common_ancestors),
                            &mrtree);
        if (clean < 0) {
                flush_output(o);