Skip to content

Commit bab5687

Browse files
newrengitster
authored andcommitted
merge-recursive: rename 'mrtree' to 'result_tree', for clarity
It is not at all clear what 'mr' was supposed to stand for, at least not to me. Pick a clearer name for this variable. Signed-off-by: Elijah Newren <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent ff1bfa2 commit bab5687

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

merge-recursive.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3477,7 +3477,7 @@ static int merge_recursive_internal(struct merge_options *opt,
34773477
{
34783478
struct commit_list *iter;
34793479
struct commit *merged_merge_bases;
3480-
struct tree *mrtree;
3480+
struct tree *result_tree;
34813481
int clean;
34823482
const char *ancestor_name;
34833483
struct strbuf merge_base_abbrev = STRBUF_INIT;
@@ -3557,15 +3557,16 @@ static int merge_recursive_internal(struct merge_options *opt,
35573557
repo_get_commit_tree(opt->repo, h2),
35583558
repo_get_commit_tree(opt->repo,
35593559
merged_merge_bases),
3560-
&mrtree);
3560+
&result_tree);
35613561
strbuf_release(&merge_base_abbrev);
35623562
if (clean < 0) {
35633563
flush_output(opt);
35643564
return clean;
35653565
}
35663566

35673567
if (opt->call_depth) {
3568-
*result = make_virtual_commit(opt->repo, mrtree, "merged tree");
3568+
*result = make_virtual_commit(opt->repo, result_tree,
3569+
"merged tree");
35693570
commit_list_insert(h1, &(*result)->parents);
35703571
commit_list_insert(h2, &(*result)->parents->next);
35713572
}

0 commit comments

Comments
 (0)