mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

find_unique_abbrev() simplification.

Browse Source 
Earlier it did not grok the 0{40} SHA1 very well, but what it
needed to do was to find the shortest 0{N} that is not used as a
valid object name to be consistent with the way names of valid
objects are abbreviated.  This makes some users simpler.

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano
2006-02-10 01:51:12 -08:00
parent 0a798076b8
commit 297a1aadbe
3 changed files with 10 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
diff.c
View File

@ -963,7 +963,7 @@ void diff_free_filepair(struct diff_filepair *p)
}
/* This is different from find_unique_abbrev() in that
* it needs to deal with 0{40} SHA1.
* it stuffs the result with dots for alignment.
*/
const char *diff_unique_abbrev(const unsigned char *sha1, int len)
{
@ -973,16 +973,8 @@ const char *diff_unique_abbrev(const unsigned char *sha1, int len)
return sha1_to_hex(sha1);
abbrev = find_unique_abbrev(sha1, len);
if (!abbrev) {
if (!memcmp(sha1, null_sha1, 20)) {
char *buf = sha1_to_hex(null_sha1);
if (len < 37)
strcpy(buf + len, "...");
return buf;
}
else
return sha1_to_hex(sha1);
}
if (!abbrev)
return sha1_to_hex(sha1);
abblen = strlen(abbrev);
if (abblen < 37) {
static char hex[41];