[PATCH 1/9] builtin/merge-file: fix compiler warning on MacOS with clang 11.0.0
From: Jeff Hostetler <jeffhost@microsoft.com>
Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
---
builtin/merge-file.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/builtin/merge-file.c b/builtin/merge-file.c
index c923bbf2abb..607c3d3f9e1 100644
--- a/builtin/merge-file.c
+++ b/builtin/merge-file.c
@@ -26,9 +26,9 @@ static int label_cb(const struct option *opt, const char *arg, int unset)
int cmd_merge_file(int argc, const char **argv, const char *prefix)
{
const char *names[3] = { 0 };
- mmfile_t mmfs[3] = { 0 };
+ mmfile_t mmfs[3] = { { 0 } };
mmbuffer_t result = { 0 };
- xmparam_t xmp = { 0 };
+ xmparam_t xmp = { { 0 } };
int ret = 0, i = 0, to_stdout = 0;
int quiet = 0;
struct option options[] = {
--
gitgitgadget