X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=sha1_name.c;h=fdd321448ce144aac87c6e5e50cbe08054951feb;hb=e20ce6ac762589868e46603ee1223f2f852c4403;hp=5d1e441e5a9b7c0d6a03e3ee9add8a51238a3227;hpb=2b64f88f09ae2169ec85652b46897574e352936d;p=git.git

diff --git a/sha1_name.c b/sha1_name.c
index 5d1e441e..fdd32144 100644
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -148,7 +148,7 @@ static int get_sha1_basic(const char *str, int len, unsigned char *sha1)
 	};
 	const char **p;
 
-	if (!get_sha1_hex(str, sha1))
+	if (len == 40 && !get_sha1_hex(str, sha1))
 		return 0;
 
 	for (p = prefix; *p; p++) {
@@ -208,13 +208,9 @@ static int get_sha1_1(const char *name, int len, unsigned char *sha1)
 	} else
 		parent = -1;
 
-	if (0 <= parent) {
-		ret = get_parent(name, len, sha1, parent);
-		if (!ret)
-			return 0;
-		else if(parent>0)
-			return ret;
-	}
+	if (parent >= 0)
+		return get_parent(name, len, sha1, parent);
+
 	ret = get_sha1_basic(name, len, sha1);
 	if (!ret)
 		return 0;