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

tree-walk.c: remove the_repo from fill_tree_descriptor()

Browse Source 
While at there, clean up the_repo usage in builtin/merge-tree.c a tiny
bit.

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
2019-06-27 16:28:48 +07:00
committed by Junio C Hamano
parent d3b4705ab8
commit 5e57580733
9 changed files with 29 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tree-diff.c
View File

@ -422,8 +422,8 @@ static struct combine_diff_path *ll_diff_tree_paths(
* diff_tree_oid(parent, commit) )
*/
for (i = 0; i < nparent; ++i)
tptree[i] = fill_tree_descriptor(&tp[i], parents_oid[i]);
ttree = fill_tree_descriptor(&t, oid);
tptree[i] = fill_tree_descriptor(opt->repo, &tp[i], parents_oid[i]);
ttree = fill_tree_descriptor(opt->repo, &t, oid);
/* Enable recursion indefinitely */
opt->pathspec.recursive = opt->flags.recursive;