Merge branch 'maint'

diff --git a/builtin-merge.c b/builtin-merge.c
index dcf898778202c3e4cfb249c1013a2bb59d8f7645..fa7c95472c984b0a8325aa61a75137c0a8c1e36e 100644 (file)
--- a/builtin-merge.c
+++ b/builtin-merge.c
@@ -722,12 +722,12 @@ static void add_strategies(const char *string, unsigned attr)
 static int merge_trivial(void)
 {
        unsigned char result_tree[20], result_commit[20];
-       struct commit_list *parent = xmalloc(sizeof(struct commit_list *));
+       struct commit_list *parent = xmalloc(sizeof(*parent));
 
        write_tree_trivial(result_tree);
        printf("Wonderful.\n");
        parent->item = lookup_commit(head);
-       parent->next = xmalloc(sizeof(struct commit_list *));
+       parent->next = xmalloc(sizeof(*parent->next));
        parent->next->item = remoteheads->item;
        parent->next->next = NULL;
        commit_tree(merge_msg.buf, result_tree, parent, result_commit, NULL);