From: Junio C Hamano <junkio@cox.net>
Date: Mon, 3 Oct 2005 07:36:13 +0000 (-0700)
Subject: Error message from get_sha1() on ambiguous short SHA1.
X-Git-Tag: v0.99.8a~2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=5a82b4fb3e547c4aa14cd417790b3f925713a422;p=git.git

Error message from get_sha1() on ambiguous short SHA1.

Unlike cases where "no such object exists", the case where specified
prefix is ambiguous would confuse the user if we say "no such commit"
or such.  Give an extra error message from the uniqueness check if
there are more than one objects that match the given prefix.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/sha1_name.c b/sha1_name.c
index 0225f3107..8920de1c4 100644
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -128,7 +128,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 -1;
+		return error("short SHA1 %.*s is ambiguous.", len, canonical);
 	memcpy(sha1, packed_sha1, 20);
 	return 0;
 }