development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-07-17 02:57:48 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Error message from get_sha1() on ambiguous short SHA1.

Browse source 
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>
This commit is contained in:
Junio C Hamano 2005-10-03 00:36:13 -07:00
parent 88f8f0a52b
commit 5a82b4fb3e
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sha1_name.c
View file

@ -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;
}