undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

config: respect '~' and '~user' in mailmap.file

Browse Source 
git_config_string() does not handle '~' and '~user' as part of the
value. Using git_config_pathname() fixes this.

Signed-off-by: Øystein Walle <oystwa@gmail.com>
Reviewed-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Øystein Walle 2014-05-27 10:45:58 +02:00 committed by Junio C Hamano
parent eea591373e
commit 9352fd5708
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.c
View File

@ -963,7 +963,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) static int git_default_mailmap_config(const char *var, const char *value)
{ {
if (!strcmp(var, "mailmap.file")) 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")) if (!strcmp(var, "mailmap.blob"))
return git_config_string(&git_mailmap_blob, var, value); return git_config_string(&git_mailmap_blob, var, value);