Show changes to 10 files +19 −16
builtin/blame.c, builtin/cat-file.c, builtin/check-mailmap.c, builtin/commit.c, builtin/log.c, builtin/shortlog.c, mailmap.c, mailmap.h, pretty.c, ref-filter.c
diff --git a/builtin/blame.c b/builtin/blame.c
index eac2fe7320..f3a11eff44 100644
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -1252,7 +1252,7 @@ int cmd_blame(int argc,
sb.xdl_opts = xdl_opts;
sb.no_whole_file_rename = no_whole_file_rename;
- read_mailmap(&mailmap);
+ read_mailmap(the_repository, &mailmap);
sb.found_guilty_entry = &found_guilty_entry;
sb.found_guilty_entry_data = π
diff --git a/builtin/cat-file.c b/builtin/cat-file.c
index df8e87a81f..d298e95797 100644
--- a/builtin/cat-file.c
+++ b/builtin/cat-file.c
@@ -1105,7 +1105,7 @@ int cmd_cat_file(int argc,
opt_epts = (opt == 'e' || opt == 'p' || opt == 't' || opt == 's');
if (use_mailmap)
- read_mailmap(&mailmap);
+ read_mailmap(the_repository, &mailmap);
switch (batch.objects_filter.choice) {
case LOFC_DISABLED:
diff --git a/builtin/check-mailmap.c b/builtin/check-mailmap.c
index 9cc5c59830..3f2a39cae0 100644
--- a/builtin/check-mailmap.c
+++ b/builtin/check-mailmap.c
@@ -63,9 +63,9 @@ int cmd_check_mailmap(int argc,
if (argc == 0 && !use_stdin)
die(_("no contacts specified"));
- read_mailmap(&mailmap);
+ read_mailmap(the_repository, &mailmap);
if (mailmap_blob)
- read_mailmap_blob(&mailmap, mailmap_blob);
+ read_mailmap_blob(the_repository, &mailmap, mailmap_blob);
if (mailmap_file)
read_mailmap_file(&mailmap, mailmap_file, 0);
diff --git a/builtin/commit.c b/builtin/commit.c
index 9e3a09d532..3700f66ba9 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -1155,7 +1155,7 @@ static const char *find_author_by_nickname(const char *name)
setup_revisions(ac, av, &revs, NULL);
revs.mailmap = xmalloc(sizeof(struct string_list));
string_list_init_nodup(revs.mailmap);
- read_mailmap(revs.mailmap);
+ read_mailmap(the_repository, revs.mailmap);
if (prepare_revision_walk(&revs))
die(_("revision walk setup failed"));
diff --git a/builtin/log.c b/builtin/log.c
index 8ab6d3a943..ff0227e32d 100644
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -336,7 +336,7 @@ static void cmd_log_init_finish(int argc, const char **argv, const char *prefix,
if (mailmap) {
rev->mailmap = xmalloc(sizeof(struct string_list));
string_list_init_nodup(rev->mailmap);
- read_mailmap(rev->mailmap);
+ read_mailmap(the_repository, rev->mailmap);
}
if (rev->pretty_given && rev->commit_format == CMIT_FMT_RAW) {
diff --git a/builtin/shortlog.c b/builtin/shortlog.c
index d80bf1a7d0..6b2a0b93b5 100644
--- a/builtin/shortlog.c
+++ b/builtin/shortlog.c
@@ -357,7 +357,7 @@ void shortlog_init(struct shortlog *log)
{
memset(log, 0, sizeof(*log));
- read_mailmap(&log->mailmap);
+ read_mailmap(the_repository, &log->mailmap);
log->list.strdup_strings = 1;
log->wrap = DEFAULT_WRAPLEN;
diff --git a/mailmap.c b/mailmap.c
index 37fd158a51..cf70956675 100644
--- a/mailmap.c
+++ b/mailmap.c
@@ -183,7 +183,8 @@ static void read_mailmap_string(struct string_list *map, char *buf)
}
}
-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)
{
struct object_id oid;
char *buf;
@@ -192,10 +193,10 @@ int read_mailmap_blob(struct string_list *map, const char *name)
if (!name)
return 0;
- if (repo_get_oid(the_repository, name, &oid) < 0)
+ if (repo_get_oid(repo, name, &oid) < 0)
return 0;
- buf = odb_read_object(the_repository->objects, &oid, &type, &size);
+ buf = odb_read_object(repo->objects, &oid, &type, &size);
if (!buf)
return error("unable to read mailmap object at %s", name);
if (type != OBJ_BLOB) {
@@ -209,7 +210,7 @@ int read_mailmap_blob(struct string_list *map, const char *name)
return 0;
}
-int read_mailmap(struct string_list *map)
+int read_mailmap(struct repository *repo, struct string_list *map)
{
int err = 0;
@@ -224,7 +225,7 @@ int read_mailmap(struct string_list *map)
startup_info->have_repository ?
MAILMAP_NOFOLLOW : 0);
if (startup_info->have_repository)
- err |= read_mailmap_blob(map, git_mailmap_blob);
+ err |= read_mailmap_blob(repo, map, git_mailmap_blob);
err |= read_mailmap_file(map, git_mailmap_file, 0);
return err;
}
diff --git a/mailmap.h b/mailmap.h
index 908365e1bf..fda329d715 100644
--- a/mailmap.h
+++ b/mailmap.h
@@ -1,6 +1,7 @@
#ifndef MAILMAP_H
#define MAILMAP_H
+struct repository;
struct string_list;
extern char *git_mailmap_file;
@@ -11,9 +12,10 @@ extern char *git_mailmap_blob;
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,
diff --git a/pretty.c b/pretty.c
index e0646bbc5d..ebf4da4834 100644
--- a/pretty.c
+++ b/pretty.c
@@ -781,7 +781,7 @@ static int mailmap_name(const char **email, size_t *email_len,
static struct string_list *mail_map;
if (!mail_map) {
CALLOC_ARRAY(mail_map, 1);
- read_mailmap(mail_map);
+ read_mailmap(the_repository, mail_map);
}
return mail_map->nr && map_user(mail_map, email, email_len, name, name_len);
}
diff --git a/ref-filter.c b/ref-filter.c
index 3917c4ccd9..d7a23a7b61 100644
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -1753,7 +1753,7 @@ static void grab_person(const char *who, struct atom_value *val, int deref, void
(starts_with(name + wholen, "email") &&
(atom->u.email_option.option & EO_MAILMAP))) {
if (!mailmap.items)
- read_mailmap(&mailmap);
+ read_mailmap(the_repository, &mailmap);
strbuf_addstr(&mailmap_buf, buf);
apply_mailmap_to_header(&mailmap_buf, headers, &mailmap);
wholine = find_wholine(who, wholen, mailmap_buf.buf);
Burak Kaan Karaçay