diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-05-06 21:45:44 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-05-06 21:45:44 (GMT) |
| commit | 8429f2b42d04a0598079c847c39d45d777613939 (patch) | |
| tree | 5c4c3954173955e4cbaf1551b6757512caf324fa /merge-recursive.c | |
| parent | 89d3eafe9019b407d6b2cf8913c6845bde50b178 (diff) | |
| parent | b6aec868afb17acdbd486c09602a658e14c98602 (diff) | |
| download | git-8429f2b42d04a0598079c847c39d45d777613939.zip git-8429f2b42d04a0598079c847c39d45d777613939.tar.gz git-8429f2b42d04a0598079c847c39d45d777613939.tar.bz2 | |
Merge branch 'bc/object-id'
Move from unsigned char[20] to struct object_id continues.
* bc/object-id:
match-trees: convert several leaf functions to use struct object_id
tree-walk: convert tree_entry_extract() to use struct object_id
struct name_entry: use struct object_id instead of unsigned char sha1[20]
match-trees: convert shift_tree() and shift_tree_by() to use object_id
test-match-trees: convert to use struct object_id
sha1-name: introduce a get_oid() function
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 06d31ed..65cb5d6 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)) |