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

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Jeff King <peff@xxxxxxxx> 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.



[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux