diff options
| author | brian m. carlson <sandals@crustytoothpaste.net> | 2016-04-17 23:10:38 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-04-19 15:33:06 -0700 |
| commit | 82db3d44e7a9d9219dd8e19607026bae9e435012 (patch) | |
| tree | ea9b60d94ecc8cf28d085f43ee6f38aa4aa3b583 /merge-recursive.c | |
| parent | c9baaf9db99dc9f66d9674ab5d467b73f36ab1bf (diff) | |
| download | git-82db3d44e7a9d9219dd8e19607026bae9e435012.tar.gz | |
match-trees: convert shift_tree() and shift_tree_by() to use object_id
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
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 b880ae50e7..a47c80f875 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -29,9 +29,9 @@ static struct tree *shift_tree_object(struct tree *one, struct tree *two, struct object_id shifted; if (!*subtree_shift) { - shift_tree(one->object.oid.hash, two->object.oid.hash, shifted.hash, 0); + shift_tree(&one->object.oid, &two->object.oid, &shifted, 0); } else { - shift_tree_by(one->object.oid.hash, two->object.oid.hash, shifted.hash, + shift_tree_by(&one->object.oid, &two->object.oid, &shifted, subtree_shift); } if (!oidcmp(&two->object.oid, &shifted)) |