X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=sha1_name.c;h=b13ed78cee0ee7f6d5ed3b45acee7b308a02c3f6;hb=075dd8ee5417899c9f41b90f0dceecdf85433468;hp=fe409fbce4978535bdf38773fd4e2924a68733b9;hpb=af13cdf298b927d171a58ec30c885d2a9c9bf727;p=git.git

diff --git a/sha1_name.c b/sha1_name.c
index fe409fbc..b13ed78c 100644
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -188,7 +188,10 @@ const char *find_unique_abbrev(const unsigned char *sha1, int len)
 {
 	int status;
 	static char hex[41];
+
 	memcpy(hex, sha1_to_hex(sha1), 40);
+	if (len == 40)
+		return hex;
 	while (len < 40) {
 		unsigned char sha1_ret[20];
 		status = get_short_sha1(hex, len, sha1_ret, 1);
@@ -203,11 +206,12 @@ const char *find_unique_abbrev(const unsigned char *sha1, int len)
 	return NULL;
 }
 
-static int ambiguous_path(const char *path)
+static int ambiguous_path(const char *path, int len)
 {
 	int slash = 1;
+	int cnt;
 
-	for (;;) {
+	for (cnt = 0; cnt < len; cnt++) {
 		switch (*path++) {
 		case '\0':
 			break;
@@ -222,8 +226,9 @@ static int ambiguous_path(const char *path)
 			slash = 0;
 			continue;
 		}
-		return slash;
+		break;
 	}
+	return slash;
 }
 
 static int get_sha1_basic(const char *str, int len, unsigned char *sha1)
@@ -241,7 +246,7 @@ static int get_sha1_basic(const char *str, int len, unsigned char *sha1)
 		return 0;
 
 	/* Accept only unambiguous ref paths. */
-	if (ambiguous_path(str))
+	if (ambiguous_path(str, len))
 		return -1;
 
 	for (p = prefix; *p; p++) {
@@ -249,7 +254,6 @@ static int get_sha1_basic(const char *str, int len, unsigned char *sha1)
 		if (!read_ref(pathname, sha1))
 			return 0;
 	}
-
 	return -1;
 }
 
@@ -349,7 +353,7 @@ static int peel_onion(const char *name, int len, unsigned char *sha1)
 	if (!o)
 		return -1;
 	if (!type_string) {
-		o = deref_tag(o);
+		o = deref_tag(o, name, sp - name - 2);
 		if (!o || (!o->parsed && !parse_object(o->sha1)))
 			return -1;
 		memcpy(sha1, o->sha1, 20);