1 files changed, 9 insertions, 2 deletions
diff --git a/mailmap.h b/mailmap.h
index 0f8fd2c586..908365e1bf 100644
--- a/mailmap.h
+++ b/mailmap.h
@@ -3,8 +3,15 @@
 
 struct string_list;
 
-extern const char *git_mailmap_file;
-extern const char *git_mailmap_blob;
+extern char *git_mailmap_file;
+extern char *git_mailmap_blob;
+
+/* Flags for read_mailmap_file() */
+#define MAILMAP_NOFOLLOW (1<<0)
+
+int read_mailmap_file(struct string_list *map, const char *filename,
+		      unsigned flags);
+int read_mailmap_blob(struct string_list *map, const char *name);
 
 int read_mailmap(struct string_list *map);
 void clear_mailmap(struct string_list *map);