From mboxrd@z Thu Jan 1 00:00:00 1970 From: Junio C Hamano Subject: Re: [PATCH v2 1/4] Add log.mailmap as configurational option for mailmap location Date: Sun, 01 Feb 2009 19:01:48 -0800 Message-ID: <7vwsc9o82r.fsf@gitster.siamese.dyndns.org> References: Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: git@vger.kernel.org To: Marius Storm-Olsen X-From: git-owner@vger.kernel.org Mon Feb 02 04:03:21 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 1LTp5k-0006zI-3f for gcvg-git-2@gmane.org; Mon, 02 Feb 2009 04:03:20 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753614AbZBBDBy (ORCPT ); Sun, 1 Feb 2009 22:01:54 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753465AbZBBDBy (ORCPT ); Sun, 1 Feb 2009 22:01:54 -0500 Received: from a-sasl-quonix.sasl.smtp.pobox.com ([208.72.237.25]:58913 "EHLO sasl.smtp.pobox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752920AbZBBDBx (ORCPT ); Sun, 1 Feb 2009 22:01:53 -0500 Received: from localhost.localdomain (unknown [127.0.0.1]) by b-sasl-quonix.sasl.smtp.pobox.com (Postfix) with ESMTP id A78A92A41F; Sun, 1 Feb 2009 22:01:52 -0500 (EST) Received: from pobox.com (unknown [68.225.240.211]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by b-sasl-quonix.sasl.smtp.pobox.com (Postfix) with ESMTPSA id F16422A42E; Sun, 1 Feb 2009 22:01:49 -0500 (EST) User-Agent: Gnus/5.110006 (No Gnus v0.6) Emacs/21.4 (gnu/linux) X-Pobox-Relay-ID: D797E1EA-F0D5-11DD-97AF-F63E8D1D4FD0-77302942!a-sasl-quonix.pobox.com Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Marius Storm-Olsen 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?