Merge git://ozlabs.org/~paulus/gitk
[gitweb.git] / merge-recursive.c
index fc2f00176c3082f2e1bb801e361b42c02fa3d5b8..dbb7104c043b14f2a43d67e1ca87ce88f4a55408 100644 (file)
@@ -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;