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 <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Elijah Newren committed
Aug 17, 2019 at 11:41 UTC
bab56877e04efcf1bf9154398131dd57d73725d4
1 file changed
+4
-3
merge-recursive.c
+4
-3
@@ -3477,7 +3477,7 @@ static int merge_recursive_internal(struct merge_options *opt,
3477
{
3478
struct commit_list *iter;
3479
struct commit *merged_merge_bases;
3480
- struct tree *mrtree;
3480
+ struct tree *result_tree;
3481
int clean;
3482
const char *ancestor_name;
3483
struct strbuf merge_base_abbrev = STRBUF_INIT;
@@ -3557,7 +3557,7 @@ static int merge_recursive_internal(struct merge_options *opt,
3557
repo_get_commit_tree(opt->repo, h2),
3558
repo_get_commit_tree(opt->repo,
3559
merged_merge_bases),
3560
- &mrtree);
3560
+ &result_tree);
3561
strbuf_release(&merge_base_abbrev);
3562
if (clean < 0) {
3563
flush_output(opt);
@@ -3565,7 +3565,8 @@ static int merge_recursive_internal(struct merge_options *opt,
3565
}
3566
3567
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");
3570
commit_list_insert(h1, &(*result)->parents);
3571
commit_list_insert(h2, &(*result)->parents->next);
3572
}