From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 02 Feb 2009 03:01:48 GMT
Subject: Re: [PATCH v2 1/4] Add log.mailmap as configurational option for mailmap location
Message-ID: <7vwsc9o82r.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <ce94ea88e3182e97997c23f71e184e0db64fa708.1233520945.git.marius@trolltech.com>

Marius Storm-Olsen <marius@trolltech.com> 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?