summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-05-06 10:50:06 -0700
committerJunio C Hamano <gitster@pobox.com>2011-05-06 10:50:06 -0700
commit1273738f05dedc63865085deb5d1fb8816ff809c (patch)
treeb63d47e65064ac061ed300c01ab26129a31db678 /merge-recursive.c
parent9fdc1cc872308869d76665be55367eef48f05ff6 (diff)
parent33e0f62ba981ebfdcab8c9fb6d2935712a7b9d41 (diff)
downloadgit-1273738f05dedc63865085deb5d1fb8816ff809c.tar.gz
Merge branch 'nd/struct-pathspec'
* nd/struct-pathspec: pathspec: rename per-item field has_wildcard to use_wildcard Improve tree_entry_interesting() handling code Convert read_tree{,_recursive} to support struct pathspec Reimplement read_tree_recursive() using tree_entry_interesting()
Diffstat (limited to 'merge-recursive.c')
-rw-r--r--merge-recursive.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/merge-recursive.c b/merge-recursive.c
index fb3c874ff4..ecb1806cad 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;