Re: [PATCH] mailmap: only look for .mailmap in work tree

From: Junio C Hamano <gitster@pobox.com>
Date: Feb 9, 2021, 21:23 UTC
Message-ID: <xmqqv9b1ylyj.fsf@gitster.c.googlers.com>
In-Reply-To: <YCLGgpfkJzg5nP7v@coredump.intra.peff.net>

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.

Show 11 quoted lines

> 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.