Convert find_unique_abbrev* to struct object_id
Convert find_unique_abbrev and find_unique_abbrev_r to each take a pointer to struct object_id. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:

committed by
Junio C Hamano

parent
40f5555ca3
commit
aab9583f7b
@ -915,11 +915,11 @@ static void show_combined_header(struct combine_diff_path *elem,
|
||||
"", elem->path, line_prefix, c_meta, c_reset);
|
||||
printf("%s%sindex ", line_prefix, c_meta);
|
||||
for (i = 0; i < num_parent; i++) {
|
||||
abb = find_unique_abbrev(elem->parent[i].oid.hash,
|
||||
abb = find_unique_abbrev(&elem->parent[i].oid,
|
||||
abbrev);
|
||||
printf("%s%s", i ? "," : "", abb);
|
||||
}
|
||||
abb = find_unique_abbrev(elem->oid.hash, abbrev);
|
||||
abb = find_unique_abbrev(&elem->oid, abbrev);
|
||||
printf("..%s%s\n", abb, c_reset);
|
||||
|
||||
if (mode_differs) {
|
||||
|
Reference in New Issue
Block a user