diff options
| author |  Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2019-06-27 16:28:51 +0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-06-27 12:45:17 -0700 |
| commit | 90d3405196cfe5d3c63185a33dcee57fb6ea7e8a (patch) | |
| tree | 29d7599bc8c7f952fd31214d59b9b30c5ee82857 /merge-recursive.c | |
| parent | tree-walk.c: remove the_repo from get_tree_entry_follow_symlinks() (diff) | |
| download | tgif-90d3405196cfe5d3c63185a33dcee57fb6ea7e8a.tar.xz | |
match-trees.c: remove the_repo from shift_tree*()
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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index b051066795..6d772eb0eb 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -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)) |