summaryrefslogtreecommitdiff
path: root/config.c
diff options
context:
space:
mode:
authorØystein Walle <oystwa@gmail.com>2014-05-27 08:45:58 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-05-27 19:59:32 (GMT)
commit9352fd570876ea0faf9f12251ecea06954fbe59b (patch)
treeb15d08e9d341cec91f2e78936d5aba3abe543789 /config.c
parenteea591373e139fc8aab89a78ccb0b1512a2bf0de (diff)
downloadgit-9352fd570876ea0faf9f12251ecea06954fbe59b.zip
git-9352fd570876ea0faf9f12251ecea06954fbe59b.tar.gz
git-9352fd570876ea0faf9f12251ecea06954fbe59b.tar.bz2
config: respect '~' and '~user' in mailmap.file
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>
Diffstat (limited to 'config.c')
-rw-r--r--config.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/config.c b/config.c
index 314d8ee..ec7af5f 100644
--- a/config.c
+++ b/config.c
@@ -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)
{
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);