diff options
| author | Antoine Pelisse <apelisse@gmail.com> | 2013-01-05 22:26:46 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-01-10 12:33:09 -0800 |
| commit | e6bb5f78fb351c89a80826befda3c8f06f91f249 (patch) | |
| tree | ea285a8ab9c048ba30cf524e85caddde4c12acf8 /builtin | |
| parent | d72fbe8111fbd3083d7063078c96eed27098490c (diff) | |
| download | git-e6bb5f78fb351c89a80826befda3c8f06f91f249.tar.gz git-e6bb5f78fb351c89a80826befda3c8f06f91f249.tar.xz | |
log: add log.mailmap configuration option
Teach "log.mailmap" configuration variable to turn "--use-mailmap"
option on to "git log", "git show" and "git whatchanged".
The "--no-use-mailmap" option from the command line can countermand
the setting.
Signed-off-by: Antoine Pelisse <apelisse@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/log.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/builtin/log.c b/builtin/log.c index d2bd8cea7..16e6520a5 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -31,6 +31,7 @@ static int default_abbrev_commit; static int default_show_root = 1; static int decoration_style; static int decoration_given; +static int use_mailmap_config; static const char *fmt_patch_subject_prefix = "PATCH"; static const char *fmt_pretty; @@ -106,6 +107,7 @@ static void cmd_log_init_finish(int argc, const char **argv, const char *prefix, OPT_END() }; + mailmap = use_mailmap_config; argc = parse_options(argc, argv, prefix, builtin_log_options, builtin_log_usage, PARSE_OPT_KEEP_ARGV0 | PARSE_OPT_KEEP_UNKNOWN | @@ -358,6 +360,11 @@ static int git_log_config(const char *var, const char *value, void *cb) } if (!prefixcmp(var, "color.decorate.")) return parse_decorate_color_config(var, 15, value); + if (!strcmp(var, "log.mailmap")) { + use_mailmap_config = git_config_bool(var, value); + return 0; + } + if (grep_config(var, value, cb) < 0) return -1; return git_diff_ui_config(var, value, cb); |