sha1_name: convert internals of peel_onion to object_id

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/sha1_name.c b/sha1_name.c
index b7e09ac13964a370ebb98f5242c9598c46d4a51b..72e72ab9aeea596b61da84fcf060a566375351d0 100644 (file)
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -798,7 +798,7 @@ struct object *peel_to_type(const char *name, int namelen,
 static int peel_onion(const char *name, int len, unsigned char *sha1,
                      unsigned lookup_flags)
 {
 static int peel_onion(const char *name, int len, unsigned char *sha1,
                      unsigned lookup_flags)
 {

-       unsigned char outer[20];
+       struct object_id outer;

        const char *sp;
        unsigned int expected_type = 0;
        struct object *o;
        const char *sp;
        unsigned int expected_type = 0;
        struct object *o;


@@ -846,10 +846,10 @@ static int peel_onion(const char *name, int len, unsigned char *sha1,
        else if (expected_type == OBJ_TREE)
                lookup_flags |= GET_SHA1_TREEISH;
 
        else if (expected_type == OBJ_TREE)
                lookup_flags |= GET_SHA1_TREEISH;
 

-       if (get_sha1_1(name, sp - name - 2, outer, lookup_flags))
+       if (get_sha1_1(name, sp - name - 2, outer.hash, lookup_flags))

                return -1;
 
                return -1;
 

-       o = parse_object(outer);
+       o = parse_object(outer.hash);

        if (!o)
                return -1;
        if (!expected_type) {
        if (!o)
                return -1;
        if (!expected_type) {