diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2018-11-18 17:47:56 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-19 02:50:33 +0100 |
| commit | e092073d643b17c82d72cf692fbfaea9c9796f11 (patch) | |
| tree | 303e6f2f58bf1817a9b0f9365761e86c5bc1053a /merge-recursive.c | |
| parent | RelNotes: name the release properly (diff) | |
| download | git-e092073d643b17c82d72cf692fbfaea9c9796f11.tar.xz git-e092073d643b17c82d72cf692fbfaea9c9796f11.zip | |
tree.c: make read_tree*() take 'struct repository *'
These functions call tree_entry_interesting() which will soon require
a 'struct index_state *' to be passed in. Instead of just changing the
function signature to take an index, update to take a repo instead
because these functions do need object database access.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 acc2f64a4e..b9467f5ecf 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -463,7 +463,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, |