summaryrefslogtreecommitdiff
path: root/config.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2012-12-12 11:04:04 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-12-12 19:12:35 (GMT)
commit086109006f695166daf2934417a20681b0c94ab8 (patch)
treed249ca71b8fa4caf806790de5853bf2dd3df2138 /config.c
parent7c8ce308d383ce6888f69e39f0d32322600c2cc2 (diff)
downloadgit-086109006f695166daf2934417a20681b0c94ab8.zip
git-086109006f695166daf2934417a20681b0c94ab8.tar.gz
git-086109006f695166daf2934417a20681b0c94ab8.tar.bz2
mailmap: support reading mailmap from blobs
In a bare repository, there isn't a simple way to respect an in-tree mailmap without extracting it to a temporary file. This patch provides a config variable, similar to mailmap.file, which reads the mailmap from a blob in the repository. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'config.c')
-rw-r--r--config.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/config.c b/config.c
index fb3f868..97364c0 100644
--- a/config.c
+++ b/config.c
@@ -839,6 +839,8 @@ 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);
+ if (!strcmp(var, "mailmap.blob"))
+ return git_config_string(&git_mailmap_blob, var, value);
/* Add other config variables here and to Documentation/config.txt. */
return 0;