summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorElijah Newren <newren@gmail.com>2019-08-17 18:41:35 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-08-19 17:08:04 (GMT)
commitbab56877e04efcf1bf9154398131dd57d73725d4 (patch)
treeae709927e5f6aadc585b1871a9ff621d28c0385b /merge-recursive.c
parentff1bfa2cd5693900a84750dc47cda3cee3cf6ba7 (diff)
downloadgit-bab56877e04efcf1bf9154398131dd57d73725d4.zip
git-bab56877e04efcf1bf9154398131dd57d73725d4.tar.gz
git-bab56877e04efcf1bf9154398131dd57d73725d4.tar.bz2
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>
Diffstat (limited to 'merge-recursive.c')
-rw-r--r--merge-recursive.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/merge-recursive.c b/merge-recursive.c
index 3287113..1823a87 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -3477,7 +3477,7 @@ static int merge_recursive_internal(struct merge_options *opt,
{
struct commit_list *iter;
struct commit *merged_merge_bases;
- struct tree *mrtree;
+ struct tree *result_tree;
int clean;
const char *ancestor_name;
struct strbuf merge_base_abbrev = STRBUF_INIT;
@@ -3557,7 +3557,7 @@ static int merge_recursive_internal(struct merge_options *opt,
repo_get_commit_tree(opt->repo, h2),
repo_get_commit_tree(opt->repo,
merged_merge_bases),
- &mrtree);
+ &result_tree);
strbuf_release(&merge_base_abbrev);
if (clean < 0) {
flush_output(opt);
@@ -3565,7 +3565,8 @@ static int merge_recursive_internal(struct merge_options *opt,
}
if (opt->call_depth) {
- *result = make_virtual_commit(opt->repo, mrtree, "merged tree");
+ *result = make_virtual_commit(opt->repo, result_tree,
+ "merged tree");
commit_list_insert(h1, &(*result)->parents);
commit_list_insert(h2, &(*result)->parents->next);
}