mirror of
https://github.com/git/git
synced 2024-08-28 12:09:19 +00:00
Merge branch 'ow/config-mailmap-pathname'
mailmap.file configuration names a pathname, hence should honor ~/path and ~user/path as its value. * ow/config-mailmap-pathname: config: respect '~' and '~user' in mailmap.file
This commit is contained in:
commit
c37d3269d9
2
config.c
2
config.c
|
@ -953,7 +953,7 @@ static int git_default_push_config(const char *var, const char *value)
|
|||
static int git_default_mailmap_config(const char *var, const char *value)
|
||||
{
|
||||
if (!strcmp(var, "mailmap.file"))
|
||||
return git_config_string(&git_mailmap_file, var, value);
|
||||
return git_config_pathname(&git_mailmap_file, var, value);
|
||||
if (!strcmp(var, "mailmap.blob"))
|
||||
return git_config_string(&git_mailmap_blob, var, value);
|
||||
|
||||
|
|
Loading…
Reference in a new issue