[PATCH 3/4] ll-merge: initialize default_opts const
From: Ramkumar Ramachandra <hidden>
Date: 2016-06-15 22:52:29
Subsystem:
the rest · Maintainer:
Linus Torvalds
Signed-off-by: Ramkumar Ramachandra <redacted> --- ll-merge.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/ll-merge.c b/ll-merge.c
index da59738..205aed3 100644
--- a/ll-merge.c
+++ b/ll-merge.c@@ -351,7 +351,7 @@ int ll_merge(mmbuffer_t *result_buf, const struct ll_merge_options *opts) { static struct git_attr_check check[2]; - static const struct ll_merge_options default_opts; + static const struct ll_merge_options default_opts = {0, 0, 0, 0}; const char *ll_driver_name = NULL; int marker_size = DEFAULT_CONFLICT_MARKER_SIZE; const struct ll_merge_driver *driver;
--
1.7.6.351.gb35ac.dirty