From: brian m. carlson <sandals@crustytoothpaste.net>
Date: Sat, 6 May 2017 22:10:29 +0000 (+0000)
Subject: sha1_name: convert internals of peel_onion to object_id
X-Git-Tag: v2.14.0-rc0~166^2~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=de37d50d76f4cfac2876af8a8ceff0f65b5f27b0;p=thirdparty%2Fgit.git

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 b7e09ac139..72e72ab9ae 100644
--- 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)
 {
-	unsigned char outer[20];
+	struct object_id outer;
 	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;
 
-	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;
 
-	o = parse_object(outer);
+	o = parse_object(outer.hash);
 	if (!o)
 		return -1;
 	if (!expected_type) {