Merge branch 'bc/submodule-status-ignored'

diff --git a/merge-recursive.c b/merge-recursive.c
index f95933b0aacce84a8b911634e5c40d5e937a322b..40eb840a52acce0d21a17ce5a898e93f164aef97 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -298,7 +298,7 @@ static int get_files_dirs(struct merge_options *o, struct tree *tree)
 {
        int n;
        struct pathspec match_all;
-       init_pathspec(&match_all, NULL);
+       memset(&match_all, 0, sizeof(match_all));
        if (read_tree_recursive(tree, "", 0, 0, &match_all, save_files_dirs, o))
                return 0;
        n = o->current_file_set.nr + o->current_directory_set.nr;