development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-29 04:29:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

builtin-merge: add missing structure initialization

Browse source 
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>
This commit is contained in:
Pierre Habouzit 2008-07-21 22:32:53 -07:00 committed by Junio C Hamano
parent 1719b5e446
commit 5d2299de2d
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
builtin-merge.c
View 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;