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 <madcoder@debian.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Pierre Habouzit committed
Jul 21, 2008 at 22:32 UTC
5d2299de2d9ff01318bc02ea8c7fbf8d3a699ae0
1 file changed
+1
builtin-merge.c
+1
@@ -572,6 +572,7 @@ static int checkout_fast_forward(unsigned char *head, unsigned char *remote)
572
memset(&trees, 0, sizeof(trees));
573
memset(&opts, 0, sizeof(opts));
574
memset(&t, 0, sizeof(t));
575
+ memset(&dir, 0, sizeof(dir));
576
dir.show_ignored = 1;
577
dir.exclude_per_dir = ".gitignore";
578
opts.dir = &dir;