diff options
author | Junio C Hamano <gitster@pobox.com> | 2009-02-15 01:44:15 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-02-15 01:44:15 -0800 |
commit | 160d2bc35382fb23beb99457e9111d15554bf223 (patch) | |
tree | ec3722d8676e73f69c0ab172cf44a06c7aac5fc6 /config.c | |
parent | 2a8644c7f163e4b76a36739ba936f8d5d91c3cf4 (diff) | |
parent | 7d48e9e6f77d336376c1a554eeff0590f77e1ee1 (diff) | |
download | git-160d2bc35382fb23beb99457e9111d15554bf223.tar.gz |
Merge branch 'ms/mailmap'
* ms/mailmap:
Move mailmap documentation into separate file
Change current mailmap usage to do matching on both name and email of author/committer.
Add map_user() and clear_mailmap() to mailmap
Add find_insert_index, insert_at_index and clear_func functions to string_list
Add mailmap.file as configurational option for mailmap location
Diffstat (limited to 'config.c')
-rw-r--r-- | config.c | 12 |
1 files changed, 12 insertions, 0 deletions
@@ -565,6 +565,15 @@ static int git_default_branch_config(const char *var, const char *value) return 0; } +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); + + /* Add other config variables here and to Documentation/config.txt. */ + return 0; +} + int git_default_config(const char *var, const char *value, void *dummy) { if (!prefixcmp(var, "core.")) @@ -579,6 +588,9 @@ int git_default_config(const char *var, const char *value, void *dummy) if (!prefixcmp(var, "branch.")) return git_default_branch_config(var, value); + if (!prefixcmp(var, "mailmap.")) + return git_default_mailmap_config(var, value); + if (!strcmp(var, "pager.color") || !strcmp(var, "color.pager")) { pager_use_color = git_config_bool(var,value); return 0; |