Re: [RFC] mailmap.blob overrides default .mailmap

2017-02-08 Thread Jeff King
On Tue, Feb 07, 2017 at 11:45:31PM +0100, Cornelius Weig wrote: > On the other hand, a checked-in .mailmap file and a mailmap-blob are > both as in-history as the other to me. Now consider the following > settings: I think it depends how you use them. You could point mailmap.blob to some other re

Re: [RFC] mailmap.blob overrides default .mailmap

2017-02-07 Thread Cornelius Weig
On 02/07/2017 08:28 PM, Jeff King wrote: > > I think it was mostly that I had to define _some_ order. This made sense > to me as similar to things like attributes or excludes, where we prefer > clone-specific data over in-history data (so .git/info/attributes takes > precedence over .gitattributes

Re: [RFC] mailmap.blob overrides default .mailmap

2017-02-07 Thread Jeff King
On Tue, Feb 07, 2017 at 09:27:19AM -0800, Stefan Beller wrote: > > The code shows why (mailmap.c): > > err |= read_mailmap_file(map, ".mailmap", repo_abbrev); > > if (startup_info->have_repository) > > err |= read_mailmap_blob(map, git_mailmap_blob, > > repo_abbrev

Re: [RFC] mailmap.blob overrides default .mailmap

2017-02-07 Thread Stefan Beller
On Tue, Feb 7, 2017 at 3:56 AM, Cornelius Weig wrote: > Hi, > > I was reading into the mailmap handling today and I'm a bit puzzled by the > overriding behavior. > > This is what the documentation says about precedence (emphasis mine): > - > mailmap.file > The location of an augm

[RFC] mailmap.blob overrides default .mailmap

2017-02-07 Thread Cornelius Weig
Hi, I was reading into the mailmap handling today and I'm a bit puzzled by the overriding behavior. This is what the documentation says about precedence (emphasis mine): - mailmap.file The location of an augmenting mailmap file. The default mailmap, located in the root of th