git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: Bryan Turner <bturner@atlassian.com>, SURA <surak8806@gmail.com>,
	Git Users <git@vger.kernel.org>
Subject: Re: [PATCH] mailmap: only look for .mailmap in work tree
Date: Tue, 09 Feb 2021 13:23:32 -0800	[thread overview]
Message-ID: <xmqqv9b1ylyj.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <YCLGgpfkJzg5nP7v@coredump.intra.peff.net> (Jeff King's message of "Tue, 9 Feb 2021 12:29:38 -0500")

Jeff King <peff@peff.net> writes:

>   If the file `.mailmap` exists at the toplevel of the repository[...]
>
> which likewise reinforces the notion that we are looking in the working
> tree.

> diff --git a/mailmap.c b/mailmap.c
> index eb77c6e77c..9bb9cf8b30 100644
> --- a/mailmap.c
> +++ b/mailmap.c
> @@ -225,7 +225,8 @@ int read_mailmap(struct string_list *map)
>  	if (!git_mailmap_blob && is_bare_repository())
>  		git_mailmap_blob = "HEAD:.mailmap";
>  
> -	err |= read_mailmap_file(map, ".mailmap");
> +	if (!startup_info->have_repository || !is_bare_repository())
> +		err |= read_mailmap_file(map, ".mailmap");

OK.  Do we know at this point that cwd is always/already at the root
level of the working tree?

Thanks.

  parent reply	other threads:[~2021-02-09 22:25 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-02-01  3:05 I've noticed the command `git --git-dir=<path> shortlog` SURA
2021-02-05 16:57 ` Jeff King
2021-02-05 20:02   ` Bryan Turner
2021-02-09 17:29     ` [PATCH] mailmap: only look for .mailmap in work tree Jeff King
2021-02-09 19:00       ` Eric Sunshine
2021-02-09 22:16         ` Junio C Hamano
2021-02-10 16:05         ` Jeff King
2021-02-09 21:23       ` Junio C Hamano [this message]
2021-02-10 16:15         ` Jeff King
2021-02-10 20:10           ` Junio C Hamano
2021-02-10 20:31             ` Jeff King
2021-02-10 20:34               ` Jeff King

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=xmqqv9b1ylyj.fsf@gitster.c.googlers.com \
    --to=gitster@pobox.com \
    --cc=bturner@atlassian.com \
    --cc=git@vger.kernel.org \
    --cc=peff@peff.net \
    --cc=surak8806@gmail.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).