diff options
| author | Øystein Walle <oystwa@gmail.com> | 2014-05-27 10:45:58 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-05-27 12:59:32 -0700 |
| commit | 9352fd570876ea0faf9f12251ecea06954fbe59b (patch) | |
| tree | b15d08e9d341cec91f2e78936d5aba3abe543789 /config.c | |
| parent | eea591373e139fc8aab89a78ccb0b1512a2bf0de (diff) | |
| download | git-9352fd570876ea0faf9f12251ecea06954fbe59b.tar.gz | |
config: respect '~' and '~user' in mailmap.fileow/config-mailmap-pathname
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>
Diffstat (limited to 'config.c')
| -rw-r--r-- | config.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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); |