diff options
| author | Derrick Stolee <dstolee@microsoft.com> | 2018-04-06 19:09:38 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-04-11 01:47:16 (GMT) |
| commit | 2e27bd7731d47b374c1c14b53af07b3bfa39fcac (patch) | |
| tree | c7635d69f1c20bfb0d3a61feebcedca13d9161ad /notes-merge.c | |
| parent | 5bb03de102b40d9e564be3a3a39084a550db79cb (diff) | |
| download | git-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 'notes-merge.c')
| -rw-r--r-- | notes-merge.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/notes-merge.c b/notes-merge.c index 1d3edc8..4a73a21 100644 --- a/notes-merge.c +++ b/notes-merge.c @@ -600,14 +600,14 @@ int notes_merge(struct notes_merge_options *o, printf("No merge base found; doing history-less merge\n"); } else if (!bases->next) { base_oid = &bases->item->object.oid; - base_tree_oid = &bases->item->maybe_tree->object.oid; + base_tree_oid = get_commit_tree_oid(bases->item); if (o->verbosity >= 4) printf("One merge base found (%.7s)\n", oid_to_hex(base_oid)); } else { /* TODO: How to handle multiple merge-bases? */ base_oid = &bases->item->object.oid; - base_tree_oid = &bases->item->maybe_tree->object.oid; + base_tree_oid = get_commit_tree_oid(bases->item); if (o->verbosity >= 3) printf("Multiple merge bases found. Using the first " "(%.7s)\n", oid_to_hex(base_oid)); @@ -634,8 +634,9 @@ int notes_merge(struct notes_merge_options *o, goto found_result; } - result = merge_from_diffs(o, base_tree_oid, &local->maybe_tree->object.oid, - &remote->maybe_tree->object.oid, local_tree); + result = merge_from_diffs(o, base_tree_oid, + get_commit_tree_oid(local), + get_commit_tree_oid(remote), local_tree); if (result != 0) { /* non-trivial merge (with or without conflicts) */ /* Commit (partial) result */ |