From: Junio C Hamano <junkio@cox.net>
Date: Thu, 20 Oct 2005 05:48:16 +0000 (-0700)
Subject: Make sure we barf on ref^{type} failure.
X-Git-Tag: v0.99.9~79^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=6e1c6c103c522d01829f3a63992a023ff031e851;p=git.git

Make sure we barf on ref^{type} failure.

Martin Langhoff noticed that ref^0 barfed correctly when we did not
have the commit in a broken repository, but ref^{commit} didn't.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/sha1_name.c b/sha1_name.c
index 75c688ecf..cc320d3d7 100644
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -323,6 +323,8 @@ static int peel_onion(const char *name, int len, unsigned char *sha1)
 		return -1;
 	if (!type_string) {
 		o = deref_tag(o);
+		if (!o || (!o->parsed && !parse_object(o->sha1)))
+			return -1;
 		memcpy(sha1, o->sha1, 20);
 	}
 	else {
@@ -332,7 +334,7 @@ static int peel_onion(const char *name, int len, unsigned char *sha1)
 		 */
 
 		while (1) {
-			if (!o)
+			if (!o || (!o->parsed && !parse_object(o->sha1)))
 				return -1;
 			if (o->type == type_string) {
 				memcpy(sha1, o->sha1, 20);