Merge branch 'cm/rebase-i-updates'

[thirdparty/git.git] / fmt-merge-msg.c

diff --git a/fmt-merge-msg.c b/fmt-merge-msg.c
index 1e51492a05085f4e76bed5a32d72a6e2049b1271..0f66818e0f839f08cf5cc46cb6943f6542c4208b 100644 (file)
--- a/fmt-merge-msg.c
+++ b/fmt-merge-msg.c
@@ -130,7 +130,7 @@ static int handle_line(char *line, struct merge_parents *merge_parents)
        if (!find_merge_parent(merge_parents, &oid, NULL))
                return 0; /* subsumed by other parents */
 
-       origin_data = xcalloc(1, sizeof(struct origin_data));
+       CALLOC_ARRAY(origin_data, 1);
        oidcpy(&origin_data->oid, &oid);
 
        if (line[len - 1] == '\n')