Marius Storm-Olsen <marius@xxxxxxxxxxxxx> writes: > This allows us to override a repo mailmap file, or to use > mailmap files elsewhere than the repository root. I think the new feature is not so well conceived. Should it always be a wholesale override, or should it also support augmenting the repository version with a private copy? > diff --git a/builtin-blame.c b/builtin-blame.c > index aae14ef..4b63775 100644 > --- a/builtin-blame.c > +++ b/builtin-blame.c > @@ -2394,7 +2394,7 @@ parse_done: > die("reading graft file %s failed: %s", > revs_file, strerror(errno)); > > - read_mailmap(&mailmap, ".mailmap", NULL); > + read_mailmap(&mailmap, NULL, NULL); Your callers always seem to pass NULL for the second argument. Doesn't it make a lot more sense to get rid of it? -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html