Skip to content

Commit 5d2299d

Browse files
MadCodergitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 1719b5e commit 5d2299d

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

builtin-merge.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -572,6 +572,7 @@ static int checkout_fast_forward(unsigned char *head, unsigned char *remote)
572572
memset(&trees, 0, sizeof(trees));
573573
memset(&opts, 0, sizeof(opts));
574574
memset(&t, 0, sizeof(t));
575+
memset(&dir, 0, sizeof(dir));
575576
dir.show_ignored = 1;
576577
dir.exclude_per_dir = ".gitignore";
577578
opts.dir = &dir;

0 commit comments

Comments
 (0)