summaryrefslogtreecommitdiff
path: root/pretty.c
diff options
context:
space:
mode:
authorMarius Storm-Olsen <marius@trolltech.com>2009-02-08 14:34:27 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-02-08 20:36:26 (GMT)
commitd551a488169aeb2ac09dba781f2ffbecf3425996 (patch)
tree04a6e379953fbabdbe17dddd8732f778b20cec84 /pretty.c
parent88ccb9f9745ff1f44bff7c6d6c17ad4b46870706 (diff)
downloadgit-d551a488169aeb2ac09dba781f2ffbecf3425996.zip
git-d551a488169aeb2ac09dba781f2ffbecf3425996.tar.gz
git-d551a488169aeb2ac09dba781f2ffbecf3425996.tar.bz2
Add mailmap.file as configurational option for mailmap location
This allows us to augment the repo mailmap file, and to use mailmap files elsewhere than the repository root. Meaning that the entries in mailmap.file will override the entries in "./.mailmap", should they match. Signed-off-by: Marius Storm-Olsen <marius@trolltech.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'pretty.c')
-rw-r--r--pretty.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/pretty.c b/pretty.c
index cc460b5..9e03d6a 100644
--- a/pretty.c
+++ b/pretty.c
@@ -312,7 +312,7 @@ static int mailmap_name(struct strbuf *sb, const char *email)
if (!mail_map) {
mail_map = xcalloc(1, sizeof(*mail_map));
- read_mailmap(mail_map, ".mailmap", NULL);
+ read_mailmap(mail_map, NULL);
}
if (!mail_map->nr)