summaryrefslogtreecommitdiff
path: root/builtin-merge.c
diff options
context:
space:
mode:
authorPierre Habouzit <madcoder@debian.org>2008-07-21 22:32:53 -0700
committerJunio C Hamano <gitster@pobox.com>2008-07-21 22:32:53 -0700
commit5d2299de2d9ff01318bc02ea8c7fbf8d3a699ae0 (patch)
treeec1de2571ece72d8eae38fa54a6533c3ff1b50f7 /builtin-merge.c
parent1719b5e446f54e4196903ae6ed5f8867a5755bf6 (diff)
downloadgit-5d2299de2d9ff01318bc02ea8c7fbf8d3a699ae0.tar.gz
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>
Diffstat (limited to 'builtin-merge.c')
-rw-r--r--builtin-merge.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin-merge.c b/builtin-merge.c
index 0fd7985a11..8825dcf8d9 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;