diff options
| author | René Scharfe <l.s.r@web.de> | 2014-07-10 09:41:40 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-07-10 21:07:16 (GMT) |
| commit | 910a09a7350a556f7f367680294fca8d05ddc5f5 (patch) | |
| tree | a3f0b318ca90de936a002d682412319ec58655b3 /builtin/merge.c | |
| parent | 294b2680cd89234618e329e090b68dc69cc41a37 (diff) | |
| download | git-910a09a7350a556f7f367680294fca8d05ddc5f5.zip git-910a09a7350a556f7f367680294fca8d05ddc5f5.tar.gz git-910a09a7350a556f7f367680294fca8d05ddc5f5.tar.bz2 | |
merge: simplify merge_trivial() by using commit_list_append()
Build the commit_list of parents by calling commit_list_append() twice
instead of allocating and linking the items by hand. This makes the
code shorter and simpler. Rename the commit_list from parent to parents
(plural) while at it because there are two of them.
Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge.c')
| -rw-r--r-- | builtin/merge.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index b49c310..f50270e 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -843,16 +843,14 @@ static void prepare_to_commit(struct commit_list *remoteheads) static int merge_trivial(struct commit *head, struct commit_list *remoteheads) { unsigned char result_tree[20], result_commit[20]; - struct commit_list *parent = xmalloc(sizeof(*parent)); + struct commit_list *parents, **pptr = &parents; write_tree_trivial(result_tree); printf(_("Wonderful.\n")); - parent->item = head; - parent->next = xmalloc(sizeof(*parent->next)); - parent->next->item = remoteheads->item; - parent->next->next = NULL; + pptr = commit_list_append(head, pptr); + pptr = commit_list_append(remoteheads->item, pptr); prepare_to_commit(remoteheads); - if (commit_tree(merge_msg.buf, merge_msg.len, result_tree, parent, + if (commit_tree(merge_msg.buf, merge_msg.len, result_tree, parents, result_commit, NULL, sign_commit)) die(_("failed to write commit object")); finish(head, remoteheads, result_commit, "In-index merge"); |