mirror of
https://github.com/git/git
synced 2024-09-14 05:45:13 +00:00
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>
This commit is contained in:
parent
1719b5e446
commit
5d2299de2d
|
@ -572,6 +572,7 @@ static int checkout_fast_forward(unsigned char *head, unsigned char *remote)
|
||||||
memset(&trees, 0, sizeof(trees));
|
memset(&trees, 0, sizeof(trees));
|
||||||
memset(&opts, 0, sizeof(opts));
|
memset(&opts, 0, sizeof(opts));
|
||||||
memset(&t, 0, sizeof(t));
|
memset(&t, 0, sizeof(t));
|
||||||
|
memset(&dir, 0, sizeof(dir));
|
||||||
dir.show_ignored = 1;
|
dir.show_ignored = 1;
|
||||||
dir.exclude_per_dir = ".gitignore";
|
dir.exclude_per_dir = ".gitignore";
|
||||||
opts.dir = &dir;
|
opts.dir = &dir;
|
||||||
|
|
Loading…
Reference in a new issue