From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marius Storm-Olsen Subject: Re: [PATCH v2 1/4] Add log.mailmap as configurational option for mailmap location Date: Mon, 02 Feb 2009 09:26:47 +0100 Message-ID: <4986AE47.3010305@trolltech.com> References: <7vwsc9o82r.fsf@gitster.siamese.dyndns.org> <4986A539.3080606@trolltech.com> <7vr62hl1a3.fsf@gitster.siamese.dyndns.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="------------enig63101D2727C3471F1C836AD5" Cc: git@vger.kernel.org To: Junio C Hamano X-From: git-owner@vger.kernel.org Mon Feb 02 09:28:31 2009 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1LTuAQ-0006Zz-Ja for gcvg-git-2@gmane.org; Mon, 02 Feb 2009 09:28:31 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751602AbZBBI0v (ORCPT ); Mon, 2 Feb 2009 03:26:51 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751384AbZBBI0v (ORCPT ); Mon, 2 Feb 2009 03:26:51 -0500 Received: from hoat.troll.no ([62.70.27.150]:55331 "EHLO hoat.troll.no" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750698AbZBBI0u (ORCPT ); Mon, 2 Feb 2009 03:26:50 -0500 Received: from hoat.troll.no (tedur.troll.no [62.70.27.154]) by hoat.troll.no (Postfix) with SMTP id 93F6D20B76; Mon, 2 Feb 2009 09:26:47 +0100 (CET) Received: from [172.24.90.95] (unknown [172.24.90.95]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by hoat.troll.no (Postfix) with ESMTP id 7F29A20AF8; Mon, 2 Feb 2009 09:26:46 +0100 (CET) User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1.19) Gecko/20081209 Lightning/0.9 Thunderbird/2.0.0.19 Mnenhy/0.7.5.666 In-Reply-To: <7vr62hl1a3.fsf@gitster.siamese.dyndns.org> X-Enigmail-Version: 0.95.7 Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAAFVBMVEXU1NTAwMABAQGsrKyE hIQwMDAEBAS8hGUfAAACQUlEQVQ4jV2TS47cMAxEKSDZW1CfwMB4PYLkrKchsveJRR2gEen+R0hR 9vziBmahhyqSRQ4NfF1FmIv3dH4usNAGoFprBVguQJmZ1nX0XiHgEukTCK3TairiZeXcVGzmZIoU 3738pehdVbiU9KFgMQWeZ1fpHZDfRS4rPb3eQVaZChGx4ikt5GDkAZQ2KKohzjklno4+iJpVhxka ZjSpasJ4gdGaEQMWTMjRa5uTqza0XDJjzhIdzGTMrqoopimoIPCKZtVOq265MAXpMLXycmVl2Y8C oE1FkT/faKauOjYoHJyOxHfvixjowvI0xZJsKykubgLYzuJMdBO+L86TjxfQ9hz9jpSudbnXXzRm tor5i3MUONpOfARAhlWbzWF7OhP2eSeEW9HUBNiHOxUM8HLWHhUAj3NZNsdqRZpNA+DJ+XlX+Qc9 Z4ZjHX8LRUzgTBBef84NQoCMOcS0+BMsj3klbTzRri03ugXr9em1GfgzDAyEn4J3fvFI5YwdTrYu 1ntAY1h5ysM2OMGm+cBOocCXHisAHu2PagnLghoG2krz8bzsA4fj7KxCGk+63jt+DDCtYjbFNkHD nRwpRqsQYx5WYzsbm/eBfn0I4TbOGvMWqhQAiEDzNs4apumCI0x2OyHtY7uAlZff/sanbH9+AGT1 KOEmUlJISdYPgEgehw+cTZEf6xeFyoEjCPgv+A62KhW3EOy9PL7WmCBMRWmfYN0OqW9krzl/Ay91 75HMqfDtP8UFckFUX2rwrm/kTVB2gH+hdu4avZVCuAAAAABJRU5ErkJggg== Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enig63101D2727C3471F1C836AD5 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: quoted-printable Junio C Hamano said the following on 02.02.2009 08:56: > Marius Storm-Olsen writes: >> Junio C Hamano said the following on 02.02.2009 04:01: >>> 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.=20 >> I assume that the normal .mailmap file should be parsed first, >> then the log.mailmap one? >=20 > 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. Oh, I see. *ponder* maybe, though you could say that about any option=20 in the .git/config file, right? >> 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. >=20 > 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. >=20 > 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. I'm not sure of the use case of the command line option. In which case=20 would you want to only use the mailmap for that one command? It=20 doesn't normally affect your git commands, so it doesn't hurt to just=20 set the log.mailmap option. The environment use case would be just=20 like setting it in your ~/.gitconfig, other than you can have a=20 different one for each console, I guess. Now, if we extended the mailmap feature even further, to report the=20 mappings from the rev-list code ((optional of course)), so that any=20 log viewer would show the mapped information; _then_ I would consider=20 the command-line and environment variables as mandatory. Since, then=20 you might want the feature off by default, and only use the mappings=20 when you need to figure out a breakage, thus need a quick way to=20 enable it. So, unless anyone raises their hand that they need=20 command-line/environment ways of setting the mailmap file used, I'll=20 leave it as is for now. Ok? --=20 =2Emarius [@trolltech.com] 'if you know what you're doing, it's not research' --------------enig63101D2727C3471F1C836AD5 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (MingW32) iD8DBQFJhq5HKzzXl/njVP8RAo2jAJ4pYA4zooySDFQNd77GVhixXdvXSACghu4B rNKN+nyer4+8Y/b2xf4bk6E= =M5/0 -----END PGP SIGNATURE----- --------------enig63101D2727C3471F1C836AD5--