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 4dad709,17ebdf8..d446b8e
--- 1/t/helper/test-match-trees.c
--- 2/test-match-trees.c
+++ b/t/helper/test-match-trees.c
@@@ -3,19 -3,17 +3,19 @@@
  
  int main(int ac, char **av)
  {
-       unsigned char hash1[20], hash2[20], shifted[20];
+       struct object_id hash1, hash2, shifted;
        struct tree *one, *two;
  
-       if (get_sha1(av[1], hash1))
 +      setup_git_directory();
 +
+       if (get_oid(av[1], &hash1))
                die("cannot parse %s as an object name", av[1]);
-       if (get_sha1(av[2], hash2))
+       if (get_oid(av[2], &hash2))
                die("cannot parse %s as an object name", av[2]);
-       one = parse_tree_indirect(hash1);
+       one = parse_tree_indirect(hash1.hash);
        if (!one)
                die("not a tree-ish %s", av[1]);
-       two = parse_tree_indirect(hash2);
+       two = parse_tree_indirect(hash2.hash);
        if (!two)
                die("not a tree-ish %s", av[2]);