X-Git-Url: https://git.octo.it/?a=blobdiff_plain;ds=sidebyside;f=sha1_name.c;h=ba0747c84dd1298093101e8726f2ee21d7ed23e6;hb=c8568e139ed2149fbfb7ef9a8d819d5b6b7c554f;hp=b13ed78cee0ee7f6d5ed3b45acee7b308a02c3f6;hpb=47dd0d595d04ee5283dfd8a0b4cbd6e6de8ad57f;p=git.git

diff --git a/sha1_name.c b/sha1_name.c
index b13ed78c..ba0747c8 100644
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -143,7 +143,7 @@ static int find_unique_short_object(int len, char *canonical,
 	}
 	/* Both have unique ones -- do they match? */
 	if (memcmp(packed_sha1, unpacked_sha1, 20))
-		return -2;
+		return SHORT_NAME_AMBIGUOUS;
 	memcpy(sha1, packed_sha1, 20);
 	return 0;
 }
@@ -155,7 +155,7 @@ static int get_short_sha1(const char *name, int len, unsigned char *sha1,
 	char canonical[40];
 	unsigned char res[20];
 
-	if (len < 4)
+	if (len < MINIMUM_ABBREV)
 		return -1;
 	memset(res, 0, 20);
 	memset(canonical, 'x', 40);