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

diff --cc builtin/grep.c
Simple merge

diff --cc cache.h
Simple merge

diff --cc http-push.c
Simple merge

diff --cc merge-recursive.c
Simple merge

diff --cc revision.c
Simple merge

diff --cc sha1_name.c
Simple merge

diff --cc t/helper/test-match-trees.c
index 4dad7095f10bb324f043ff8132678488b65d4537,0000000000000000000000000000000000000000..d446b8eaca727dfa9c1b0928f2b8c9af286f2702
mode 100644,000000..100644
--- 1/t/helper/test-match-trees.c
--- /dev/null
+++ b/t/helper/test-match-trees.c
@@@ -1,26 -1,0 +1,26 @@@
-       unsigned char hash1[20], hash2[20], shifted[20];
 +#include "cache.h"
 +#include "tree.h"
 +
 +int main(int ac, char **av)
 +{
-       if (get_sha1(av[1], hash1))
++      struct object_id hash1, hash2, shifted;
 +      struct tree *one, *two;
 +
 +      setup_git_directory();
 +
-       if (get_sha1(av[2], hash2))
++      if (get_oid(av[1], &hash1))
 +              die("cannot parse %s as an object name", av[1]);
-       one = parse_tree_indirect(hash1);
++      if (get_oid(av[2], &hash2))
 +              die("cannot parse %s as an object name", av[2]);
-       two = parse_tree_indirect(hash2);
++      one = parse_tree_indirect(hash1.hash);
 +      if (!one)
 +              die("not a tree-ish %s", av[1]);
-       shift_tree(one->object.oid.hash, two->object.oid.hash, shifted, -1);
-       printf("shifted: %s\n", sha1_to_hex(shifted));
++      two = parse_tree_indirect(hash2.hash);
 +      if (!two)
 +              die("not a tree-ish %s", av[2]);
 +
++      shift_tree(&one->object.oid, &two->object.oid, &shifted, -1);
++      printf("shifted: %s\n", oid_to_hex(&shifted));
 +
 +      exit(0);
 +}