Merge branch 'sp/complete-ext-alias'

diff --git a/config.c b/config.c
index 3e21fecb6a9424dc97a26939082769f562a0aecf..a1aef1cf3eca01e328b3e319636269236ea91ae0 100644 (file)
--- 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);