aboutsummaryrefslogtreecommitdiffstats
path: root/mailmap.c
diff options
context:
space:
mode:
Diffstat (limited to 'mailmap.c')
-rw-r--r--mailmap.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/mailmap.c b/mailmap.c
index 9f9fa3199a..56c72102d9 100644
--- a/mailmap.c
+++ b/mailmap.c
@@ -1,11 +1,12 @@
#define USE_THE_REPOSITORY_VARIABLE
+#define DISABLE_SIGN_COMPARE_WARNINGS
#include "git-compat-util.h"
#include "environment.h"
#include "string-list.h"
#include "mailmap.h"
#include "object-name.h"
-#include "object-store-ll.h"
+#include "odb.h"
#include "setup.h"
char *git_mailmap_file;
@@ -195,7 +196,7 @@ int read_mailmap_blob(struct string_list *map, const char *name)
if (repo_get_oid(the_repository, name, &oid) < 0)
return 0;
- buf = repo_read_object_file(the_repository, &oid, &type, &size);
+ buf = odb_read_object(the_repository->objects, &oid, &type, &size);
if (!buf)
return error("unable to read mailmap object at %s", name);
if (type != OBJ_BLOB) {