summaryrefslogtreecommitdiff
path: root/mailmap.c
diff options
context:
space:
mode:
authorbrian m. carlson <sandals@crustytoothpaste.net>2017-07-13 23:49:27 +0000
committerJunio C Hamano <gitster@pobox.com>2017-07-17 13:54:51 -0700
commit15be4a5d38c3a4408df956845e4c7a8b23920459 (patch)
tree0f62ea166d5e312690b789693da55dfe59a0b032 /mailmap.c
parentc300b1ed5b0583aa6a4bc668a5da0ec33f2573fa (diff)
downloadgit-15be4a5d38c3a4408df956845e4c7a8b23920459.tar.gz
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>
Diffstat (limited to 'mailmap.c')
-rw-r--r--mailmap.c6
1 files changed, 3 insertions, 3 deletions
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)