summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-07-16 18:33:09 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-07-16 18:33:09 (GMT)
commit1fc83452c76e65385b3da69ea94eb957e36e6c78 (patch)
tree6d6105b9a9fed643036df3d0fceabde1ab1479c7 /builtin/merge.c
parentf357797678aa5ae35c63623b8b76eb682d5b9b79 (diff)
parent9d02150cf4d833935161ef265e4dc03807caa800 (diff)
downloadgit-1fc83452c76e65385b3da69ea94eb957e36e6c78.zip
git-1fc83452c76e65385b3da69ea94eb957e36e6c78.tar.gz
git-1fc83452c76e65385b3da69ea94eb957e36e6c78.tar.bz2
Merge branch 'rs/code-cleaning'
* rs/code-cleaning: fsck: simplify fsck_commit_buffer() by using commit_list_count() commit: use commit_list_append() instead of duplicating its code merge: simplify merge_trivial() by using commit_list_append() use strbuf_addch for adding single characters use strbuf_addbuf for adding strbufs
Diffstat (limited to 'builtin/merge.c')
-rw-r--r--builtin/merge.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/builtin/merge.c b/builtin/merge.c
index 22491a1..ce82eb2 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -839,16 +839,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");