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
git-mirror · Jun 16, 2014 · c37d326 · c37d326
2 parents c9fc3a6 + 9352fd5
commit c37d326
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/config.c b/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);