From 5d2299de2d9ff01318bc02ea8c7fbf8d3a699ae0 Mon Sep 17 00:00:00 2001 From: Pierre Habouzit Date: Mon, 21 Jul 2008 22:32:53 -0700 Subject: 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 Signed-off-by: Junio C Hamano --- builtin-merge.c | 1 + 1 file changed, 1 insertion(+) (limited to 'builtin-merge.c') diff --git a/builtin-merge.c b/builtin-merge.c index 0fd7985a1..8825dcf8d 100644 --- 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; -- cgit v1.2.1