Skip to content

Commit 9352fd5

Browse files
Ossegitster
authored andcommitted
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 <[email protected]> Reviewed-by: Jeff King <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent eea5913 commit 9352fd5

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

config.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -963,7 +963,7 @@ static int git_default_push_config(const char *var, const char *value)
963963
static int git_default_mailmap_config(const char *var, const char *value)
964964
{
965965
if (!strcmp(var, "mailmap.file"))
966-
return git_config_string(&git_mailmap_file, var, value);
966+
return git_config_pathname(&git_mailmap_file, var, value);
967967
if (!strcmp(var, "mailmap.blob"))
968968
return git_config_string(&git_mailmap_blob, var, value);
969969

0 commit comments

Comments
 (0)