Merge branch 'rs/pull-signed-tag' into maint

diff --git a/merge-recursive.c b/merge-recursive.c
index 9748bafd3073b431c9c8574b721dab41233ecb09..e7178bcdccc2776947f463bfd9e53000e9d2e0ba 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -42,12 +42,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;
 }