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

[thirdparty/git.git] / builtin / merge.c

diff --git a/builtin/merge.c b/builtin/merge.c
index eb00b273e668e2725447a2d6a0edc5ad2d67ed67..388619536aa1d250d6cad275b67974bbfdca28e4 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -210,7 +210,7 @@ static struct strategy *get_strategy(const char *name)
                exit(1);
        }
 
-       ret = xcalloc(1, sizeof(struct strategy));
+       CALLOC_ARRAY(ret, 1);
        ret->name = xstrdup(name);
        ret->attr = NO_TRIVIAL;
        return ret;