From: Junio C Hamano <gitster@pobox.com>
To: Marius Storm-Olsen <marius@trolltech.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH v2 1/4] Add log.mailmap as configurational option for mailmap location
Date: Sun, 01 Feb 2009 19:01:48 -0800 [thread overview]
Message-ID: <7vwsc9o82r.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: ce94ea88e3182e97997c23f71e184e0db64fa708.1233520945.git.marius@trolltech.com
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?
> 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?
next prev parent reply other threads:[~2009-02-02 3:03 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-01 20:59 [PATCH v2 0/4] Extend mailmap functionality Marius Storm-Olsen
2009-02-01 20:59 ` [PATCH v2 1/4] Add log.mailmap as configurational option for mailmap location Marius Storm-Olsen
2009-02-01 20:59 ` [PATCH v2 2/4] Add find_insert_index, insert_at_index and clear_func functions to string_list Marius Storm-Olsen
2009-02-01 20:59 ` [PATCH v2 3/4] Add map_user() and clear_mailmap() to mailmap Marius Storm-Olsen
2009-02-01 20:59 ` [PATCH v2 4/4] Change current mailmap usage to do matching on both name and email of author/committer Marius Storm-Olsen
2009-02-02 3:03 ` [PATCH v2 2/4] Add find_insert_index, insert_at_index and clear_func functions to string_list Junio C Hamano
2009-02-02 7:49 ` Marius Storm-Olsen
2009-02-02 3:01 ` Junio C Hamano [this message]
2009-02-02 7:48 ` [PATCH v2 1/4] Add log.mailmap as configurational option for mailmap location Marius Storm-Olsen
2009-02-02 7:56 ` Junio C Hamano
2009-02-02 8:26 ` Marius Storm-Olsen
2009-02-02 8:40 ` Junio C Hamano
2009-02-02 3:03 ` [PATCH v2 0/4] Extend mailmap functionality Junio C Hamano
2009-02-02 5:26 ` Sverre Rabbelier
2009-02-02 8:07 ` Marius Storm-Olsen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vwsc9o82r.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=marius@trolltech.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).