Merge branch 'rs/xdiff-merge-overlapping-hunks-for-W-context' into maint

diff --git a/merge-recursive.c b/merge-recursive.c
index e5243c2b766881b5b4c83a16d9caebbd392c798a..e34912683ca106524616673f96fff538af8447ed 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -73,12 +73,9 @@ static struct tree *shift_tree_object(struct tree *one, struct tree *two,
 static struct commit *make_virtual_commit(struct tree *tree, const char *comment)
 {
        struct commit *commit = alloc_commit_node();
-       struct merge_remote_desc *desc = xmalloc(sizeof(*desc));
 
-       desc->name = comment;
-       desc->obj = (struct object *)commit;
+       set_merge_remote_desc(commit, comment, (struct object *)commit);
        commit->tree = tree;
-       commit->util = desc;
        commit->object.parsed = 1;
        return commit;
 }