mirror of
https://github.com/git/git.git
synced 2025-12-12 20:36:24 +01:00
Convert remaining callers of get_sha1 to get_oid.
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
c300b1ed5b
commit
15be4a5d38
@@ -214,17 +214,17 @@ static int read_mailmap_blob(struct string_list *map,
|
||||
const char *name,
|
||||
char **repo_abbrev)
|
||||
{
|
||||
unsigned char sha1[20];
|
||||
struct object_id oid;
|
||||
char *buf;
|
||||
unsigned long size;
|
||||
enum object_type type;
|
||||
|
||||
if (!name)
|
||||
return 0;
|
||||
if (get_sha1(name, sha1) < 0)
|
||||
if (get_oid(name, &oid) < 0)
|
||||
return 0;
|
||||
|
||||
buf = read_sha1_file(sha1, &type, &size);
|
||||
buf = read_sha1_file(oid.hash, &type, &size);
|
||||
if (!buf)
|
||||
return error("unable to read mailmap object at %s", name);
|
||||
if (type != OBJ_BLOB)
|
||||
|
||||
Reference in New Issue
Block a user