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

Merge branch 'bc/object-id'

Browse Source 
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
This commit is contained in:
Junio C Hamano
2016-05-06 14:45:44 -07:00
parent 89d3eafe90 b6aec868af
commit 8429f2b42d
21 changed files with 109 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
merge-recursive.c
View File

@ -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))