From 15be4a5d38c3a4408df956845e4c7a8b23920459 Mon Sep 17 00:00:00 2001 From: "brian m. carlson" Date: Thu, 13 Jul 2017 23:49:27 +0000 Subject: Convert remaining callers of get_sha1 to get_oid. Signed-off-by: brian m. carlson Signed-off-by: Junio C Hamano --- mailmap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'mailmap.c') diff --git a/mailmap.c b/mailmap.c index c1a79c100c..cb921b4db6 100644 --- a/mailmap.c +++ b/mailmap.c @@ -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) -- cgit v1.2.1