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

15
combine-diff.c
View File

@ -716,10 +716,7 @@ static int show_patch_diff(struct combine_diff_path *elem, int num_parent,
if (show_hunks || mode_differs) {
const char *abb;
char null_abb[DEFAULT_ABBREV + 1];
memset(null_abb, '0', DEFAULT_ABBREV);
null_abb[DEFAULT_ABBREV] = 0;
if (header) {
shown_header++;
puts(header);
@ -734,17 +731,11 @@ static int show_patch_diff(struct combine_diff_path *elem, int num_parent,
for (i = 0; i < num_parent; i++) {
if (elem->parent[i].mode != elem->mode)
mode_differs = 1;
if (memcmp(elem->parent[i].sha1, null_sha1, 20))
abb = find_unique_abbrev(elem->parent[i].sha1,
DEFAULT_ABBREV);
else
abb = null_abb;
abb = find_unique_abbrev(elem->parent[i].sha1,
DEFAULT_ABBREV);
printf("%s%s", i ? "," : "", abb);
}
if (memcmp(elem->sha1, null_sha1, 20))
abb = find_unique_abbrev(elem->sha1, DEFAULT_ABBREV);
else
abb = null_abb;
abb = find_unique_abbrev(elem->sha1, DEFAULT_ABBREV);
printf("..%s\n", abb);
if (mode_differs) {