From: Uwe Zeisberger <zeisberg@informatik.uni-freiburg.de>
Date: Thu, 26 Jan 2006 11:26:15 +0000 (+0100)
Subject: Use symbolic name SHORT_NAME_AMBIGUOUS as error return value
X-Git-Tag: v1.2.0~105
X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fgit.git;a=commitdiff_plain;h=e974c9ab03c3c149bfc7da663167c6e59a7659f7

Use symbolic name SHORT_NAME_AMBIGUOUS as error return value

Signed-off-by: Uwe Zeisberger <zeisberg@informatik.uni-freiburg.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/sha1_name.c b/sha1_name.c
index b13ed78cee..e18a96d772 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;
 }