mergetool: don't require a work tree for --tool-help

diff --git a/config.c b/config.c
index 6bd3575c118dc8582ab2bf59a47998d239da7a7f..2634457f6b07ca55b69f3b4a22b8a9e4339fd121 100644 (file)
--- a/config.c
+++ b/config.c
@@ -952,7 +952,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);