[PATCH 1/4] merge: simplify initialization
STALE1933d
From: Felipe Contreras <hidden>
Date: 2021-06-13 22:59:41
Subsystem:
the rest · Maintainer:
Linus Torvalds
Signed-off-by: Felipe Contreras <redacted> --- builtin/merge-file.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/builtin/merge-file.c b/builtin/merge-file.c
index 06a2f90c48..0186f4156a 100644
--- a/builtin/merge-file.c
+++ b/builtin/merge-file.c@@ -28,7 +28,7 @@ int cmd_merge_file(int argc, const char **argv, const char *prefix) const char *names[3] = { NULL, NULL, NULL }; mmfile_t mmfs[3]; mmbuffer_t result = {NULL, 0}; - xmparam_t xmp = {{0}}; + xmparam_t xmp = { .level = XDL_MERGE_ZEALOUS_ALNUM }; int ret = 0, i = 0, to_stdout = 0; int quiet = 0; struct option options[] = {
@@ -48,10 +48,6 @@ int cmd_merge_file(int argc, const char **argv, const char *prefix) OPT_END(), }; - xmp.level = XDL_MERGE_ZEALOUS_ALNUM; - xmp.style = 0; - xmp.favor = 0; - if (startup_info->have_repository) { /* Read the configuration file */ git_config(git_xmerge_config, NULL);
--
2.32.0