aboutsummaryrefslogtreecommitdiff
path: root/mailmap.h
diff options
context:
space:
mode:
Diffstat (limited to 'mailmap.h')
-rw-r--r--mailmap.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/mailmap.h b/mailmap.h
index 908365e1bf..6866cb6f1d 100644
--- a/mailmap.h
+++ b/mailmap.h
@@ -1,19 +1,18 @@
#ifndef MAILMAP_H
#define MAILMAP_H
+struct repository;
struct string_list;
-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_blob(struct repository *repo, struct string_list *map,
+ const char *name);
-int read_mailmap(struct string_list *map);
+int read_mailmap(struct repository *repo, struct string_list *map);
void clear_mailmap(struct string_list *map);
int map_user(struct string_list *map,