From: Øystein Walle <oystwa@gmail.com>
Date: Tue, 27 May 2014 08:45:58 +0000 (+0200)
Subject: config: respect '~' and '~user' in mailmap.file
X-Git-Tag: v2.0.1~23^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9352fd570876ea0faf9f12251ecea06954fbe59b;p=git

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

diff --git a/config.c b/config.c
index 314d8ee740..ec7af5f0ae 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);