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

match-trees.c: remove the_repo from shift_tree*()

Browse Source 
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:51 +07:00
committed by Junio C Hamano
parent 0dd1f0c3a6
commit 90d3405196
4 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
merge-recursive.c
View File

@ -153,9 +153,9 @@ static struct tree *shift_tree_object(struct repository *repo,
struct object_id shifted;
if (!*subtree_shift) {
shift_tree(&one->object.oid, &two->object.oid, &shifted, 0);
shift_tree(repo, &one->object.oid, &two->object.oid, &shifted, 0);
} else {
shift_tree_by(&one->object.oid, &two->object.oid, &shifted,
shift_tree_by(repo, &one->object.oid, &two->object.oid, &shifted,
subtree_shift);
}
if (oideq(&two->object.oid, &shifted))