summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorDerrick Stolee <dstolee@microsoft.com>2018-04-06 19:09:38 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-04-11 01:47:16 (GMT)
commit2e27bd7731d47b374c1c14b53af07b3bfa39fcac (patch)
treec7635d69f1c20bfb0d3a61feebcedca13d9161ad /merge-recursive.c
parent5bb03de102b40d9e564be3a3a39084a550db79cb (diff)
downloadgit-2e27bd7731d47b374c1c14b53af07b3bfa39fcac.zip
git-2e27bd7731d47b374c1c14b53af07b3bfa39fcac.tar.gz
git-2e27bd7731d47b374c1c14b53af07b3bfa39fcac.tar.bz2
treewide: replace maybe_tree with accessor methods
In anticipation of making trees load lazily, create a Coccinelle script (contrib/coccinelle/commit.cocci) to ensure that all references to the 'maybe_tree' member of struct commit are either mutations or accesses through get_commit_tree() or get_commit_tree_oid(). Apply the Coccinelle script to create the rest of the patch. Signed-off-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
-rw-r--r--merge-recursive.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/merge-recursive.c b/merge-recursive.c
index 0f75d75..8de6e36 100644
--- 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);