diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-01-14 15:29:28 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-01-14 15:29:28 -0800 |
| commit | d6f05a435f9c89f8c9860c7af692942768d81584 (patch) | |
| tree | 7b43bdb292f9cda801778647a67ddc2662504067 /merge-recursive.c | |
| parent | c333fe73682b182d6872f9e5b454c2899c6203ab (diff) | |
| parent | 5a0b97b34c51eaddf39624857f1ac0e7df4ca2e3 (diff) | |
| download | git-d6f05a435f9c89f8c9860c7af692942768d81584.tar.gz git-d6f05a435f9c89f8c9860c7af692942768d81584.tar.xz | |
Merge branch 'nd/attr-pathspec-in-tree-walk'
The traversal over tree objects has learned to honor
":(attr:label)" pathspec match, which has been implemented only for
enumerating paths on the filesystem.
* nd/attr-pathspec-in-tree-walk:
tree-walk: support :(attr) matching
dir.c: move, rename and export match_attrs()
pathspec.h: clean up "extern" in function declarations
tree-walk.c: make tree_entry_interesting() take an index
tree.c: make read_tree*() take 'struct repository *'
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index ecf8db0b7..59ba4b4a1 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -469,7 +469,8 @@ static void get_files_dirs(struct merge_options *o, struct tree *tree) { struct pathspec match_all; memset(&match_all, 0, sizeof(match_all)); - read_tree_recursive(tree, "", 0, 0, &match_all, save_files_dirs, o); + read_tree_recursive(the_repository, tree, "", 0, 0, + &match_all, save_files_dirs, o); } static int get_tree_entry_if_blob(const struct object_id *tree, |