X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=merge-recursive.c;h=db9ba19ddf94fec3a5cfff450b35f5bb7b46c35e;hb=6b37dff17f176d7e87efa93b4cf521dd725de247;hp=ae6ade4ecbbcc77bc952d223f0ae90ae2c77a0c7;hpb=24263cfb54471c4c321f204e45ac3fcfe5485614;p=git.git

diff --git a/merge-recursive.c b/merge-recursive.c
index ae6ade4ec..db9ba19dd 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -273,7 +273,9 @@ static int save_files_dirs(const unsigned char *sha1,
 static int get_files_dirs(struct merge_options *o, struct tree *tree)
 {
 	int n;
-	if (read_tree_recursive(tree, "", 0, 0, NULL, save_files_dirs, o))
+	struct pathspec match_all;
+	init_pathspec(&match_all, NULL);
+	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;
 	return n;