Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
builtin-merge: add missing structure initialization
[gitweb.git]
/
builtin-merge.c
diff --git
a/builtin-merge.c
b/builtin-merge.c
index 0fd7985a112231ba164ed3ba408519d6ce732071..8825dcf8d9c4cce3fa0321a808877237d05d4f5a 100644
(file)
--- 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;