builtin-merge: add missing structure initialization
authorPierre Habouzit <madcoder@debian.org>
Tue, 22 Jul 2008 05:32:53 +0000 (22:32 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 22 Jul 2008 05:32:53 +0000 (22:32 -0700)
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>
builtin-merge.c

index 0fd7985..8825dcf 100644 (file)
@@ -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;