diff --git a/merge-recursive.c b/merge-recursive.c
index fb3c874ff47c949dc8df89edb320accf90bc8ac9..ecb1806cad19bcc69c6dbf8528561eefffab15b2 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
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;