object-name.h: move declarations for object-name.c functions from cache.h

[thirdparty/git.git] / mailmap.c

diff --git a/mailmap.c b/mailmap.c
index da2589b08229813963347115a001d8ce6f45ae32..d62d7bf0e7f736f1d87c85d395b8a78078d20e3e 100644 (file)
--- a/mailmap.c
+++ b/mailmap.c
@@ -1,7 +1,10 @@
 #include "cache.h"
+#include "environment.h"
 #include "string-list.h"
 #include "mailmap.h"
+#include "object-name.h"
 #include "object-store.h"
+#include "setup.h"
 
 #define DEBUG_MAILMAP 0
 #if DEBUG_MAILMAP
@@ -213,10 +216,10 @@ static int read_mailmap_blob(struct string_list *map, const char *name)
 
        if (!name)
                return 0;
-       if (get_oid(name, &oid) < 0)
+       if (repo_get_oid(the_repository, name, &oid) < 0)
                return 0;
 
-       buf = read_object_file(&oid, &type, &size);
+       buf = repo_read_object_file(the_repository, &oid, &type, &size);
        if (!buf)
                return error("unable to read mailmap object at %s", name);
        if (type != OBJ_BLOB)