builtin-merge: add missing structure initialization

The parameter that is eventually passed to read_directory() to scan the working tree should be properly initialized. Signed-off-by: Pierre Habouzit <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
zkat · Jul 22, 2008 · 5d2299d · 5d2299d
1 parent 1719b5e
commit 5d2299d
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/builtin-merge.c b/builtin-merge.c
@@ -572,6 +572,7 @@ static int checkout_fast_forward(unsigned char *head, unsigned char *remote)
 	memset(&trees, 0, sizeof(trees));
 	memset(&opts, 0, sizeof(opts));
 	memset(&t, 0, sizeof(t));
+	memset(&dir, 0, sizeof(dir));
 	dir.show_ignored = 1;
 	dir.exclude_per_dir = ".gitignore";
 	opts.dir = &dir;