mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tree.c: make read_tree*() take 'struct repository *'

Browse Source 
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>
This commit is contained in:
Nguyễn Thái Ngọc Duy
2018-11-18 17:47:56 +01:00
committed by Junio C Hamano
parent 0e94dab5be
commit e092073d64
8 changed files with 35 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
merge-recursive.c
View File

@ -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,