From: Jeff King Date: Wed, 12 Dec 2012 17:59:00 GMT Subject: Re: [PATCH 0/2] mailmap from blobs Message-ID: <20121212175900.GA32767@sigill.intra.peff.net> In-Reply-To: <7vhanr5f74.fsf@alter.siamese.dyndns.org> On Wed, Dec 12, 2012 at 09:54:23AM -0800, Junio C Hamano wrote: > Jeff King writes: > > > I noticed recently that the GitHub contributions page for git.git did > > not seem very accurate. The problem is that while it uses shortlog, it > > does not respect .mailmap, because we do not have a working tree from > > which to read the .mailmap. > > > > This series adds a config option analogous to mailmap.file, but which > > reads from a blob in the repository (so the obvious thing to set it to > > is "HEAD:.mailmap" in a bare repo, and probably "master:.mailmap" if you > > frequently want to traverse while on unrelated branches). The obvious > > alternative is to checkout a temporary file of .mailmap and point > > mailmap.file at it, but this is a bit more convenient. > > Yeah, I think this is sane. > > Have you considered defaulting to read from HEAD:.mailmap even when > this new configuration is not there if core.bare is set? I would > imagine that it would be the most convenient and match people's > expectations. Yeah, I almost suggested that, but I figured it could wait for the feature to prove itself in the real world before turning it on by default. It _should_ be pretty harmless, though, so I don't mind turning it on by default. -Peff