Re: [PATCH v2 1/4] Add log.mailmap as configurational option for mailmap location

[Junio C Hamano <gitster@pobox.com>]

Marius Storm-Olsen <marius@trolltech.com> writes:

> Junio C Hamano said the following on 02.02.2009 04:01:
>> 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?
>
> Sure, I can rewrite it to be augmenting, rather than overriding.
> I assume that the normal .mailmap file should be parsed first, then
> the log.mailmap one?

Augmenting one would behave that way.  I was more wondering if people
would want to be able to choose either, perhaps from the command line
option or something.

> Sure, but I left it in to allow "old-style" usage. Just in case the
> were use-cases for not using the log.mailmap one. I can nuke the
> arguments if you don't want them anymore.

What I think would be sensible, if we really want to make this feature
flexible, would be to introduce a command line option (and perhaps
environment variable) that takes the usual precidence (the command line
that specifies the mailmap file, then the environment and then finally the
log.mailmap config variable).  And if we go that route, that "usuall NULL"
parameter would be where the callers pass the filename they got from their
command line.

But if you feel it is overengineering, I would not disagree.  In such a
case, however, I do not think there is a reason for one particular caller
to pass some custom value there, just to be inconsistent from others.