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>
brian m. carlson committed
May 6, 2017 at 22:10 UTC
de37d50d76f4cfac2876af8a8ceff0f65b5f27b0
1 file changed
+3
-3
sha1_name.c
+3
-3
@@ -798,7 +798,7 @@ struct object *peel_to_type(const char *name, int namelen,
798
static int peel_onion(const char *name, int len, unsigned char *sha1,
799
unsigned lookup_flags)
800
{
801
- unsigned char outer[20];
801
+ struct object_id outer;
802
const char *sp;
803
unsigned int expected_type = 0;
804
struct object *o;
@@ -846,10 +846,10 @@ static int peel_onion(const char *name, int len, unsigned char *sha1,
846
else if (expected_type == OBJ_TREE)
847
lookup_flags |= GET_SHA1_TREEISH;
848
849
- if (get_sha1_1(name, sp - name - 2, outer, lookup_flags))
849
+ if (get_sha1_1(name, sp - name - 2, outer.hash, lookup_flags))
850
return -1;
851
852
- o = parse_object(outer);
852
+ o = parse_object(outer.hash);
853
if (!o)
854
return -1;
855
if (!expected_type) {