X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=sha1_name.c;h=b13ed78cee0ee7f6d5ed3b45acee7b308a02c3f6;hb=e921fb82cf6fb4a5f138ec9d27bc37c658336a8c;hp=cc320d3d7fc38787190598034fceb787d95336d6;hpb=6e1c6c103c522d01829f3a63992a023ff031e851;p=git.git

diff --git a/sha1_name.c b/sha1_name.c
index cc320d3d..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,6 +206,31 @@ const char *find_unique_abbrev(const unsigned char *sha1, int len)
 	return NULL;
 }
 
+static int ambiguous_path(const char *path, int len)
+{
+	int slash = 1;
+	int cnt;
+
+	for (cnt = 0; cnt < len; cnt++) {
+		switch (*path++) {
+		case '\0':
+			break;
+		case '/':
+			if (slash)
+				break;
+			slash = 1;
+			continue;
+		case '.':
+			continue;
+		default:
+			slash = 0;
+			continue;
+		}
+		break;
+	}
+	return slash;
+}
+
 static int get_sha1_basic(const char *str, int len, unsigned char *sha1)
 {
 	static const char *prefix[] = {
@@ -217,12 +245,15 @@ static int get_sha1_basic(const char *str, int len, unsigned char *sha1)
 	if (len == 40 && !get_sha1_hex(str, sha1))
 		return 0;
 
+	/* Accept only unambiguous ref paths. */
+	if (ambiguous_path(str, len))
+		return -1;
+
 	for (p = prefix; *p; p++) {
 		char *pathname = git_path("%s/%.*s", *p, len, str);
 		if (!read_ref(pathname, sha1))
 			return 0;
 	}
-
 	return -1;
 }
 
@@ -322,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);