Merge branch 'en/ort-perf-batch-9'

[thirdparty/git.git] / ll-merge.c

diff --git a/ll-merge.c b/ll-merge.c
index 1ec0b959e015b20442aaddc417952f7a7a731d42..9a8a2c365c7a33fbf1fb4b1a50505ea19fe5558d 100644 (file)
--- a/ll-merge.c
+++ b/ll-merge.c
@@ -268,7 +268,7 @@ static int read_merge_config(const char *var, const char *value, void *cb)
                if (!strncmp(fn->name, name, namelen) && !fn->name[namelen])
                        break;
        if (!fn) {
-               fn = xcalloc(1, sizeof(struct ll_merge_driver));
+               CALLOC_ARRAY(fn, 1);
                fn->name = xmemdupz(name, namelen);
                fn->fn = ll_ext_merge;
                *ll_user_merge_tail = fn;