Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
config: respect '~' and '~user' in mailmap.file
author
Øystein Walle
<oystwa@gmail.com>
Tue, 27 May 2014 08:45:58 +0000
(10:45 +0200)
committer
Junio C Hamano
<gitster@pobox.com>
Tue, 27 May 2014 19:59:32 +0000
(12:59 -0700)
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>
config.c
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
eea5913
)
diff --git
a/config.c
b/config.c
index 314d8ee740bea488d8c79d80b3d91530ad15252d..ec7af5f0aeab456e1d8344a5c9ed599b5bdbe4f2 100644
(file)
--- a/
config.c
+++ b/
config.c
@@
-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);