diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-06-24 12:21:41 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-06-24 12:21:41 -0700 |
| commit | 20d16da5caf85801b8b606e2c9a3fa8a5c261e64 (patch) | |
| tree | 66bb911cd8625e7dae714315bd7482742131140c /builtin/blame.c | |
| parent | de04706e3151c6b34bc13513cf164ba37e6e95a7 (diff) | |
| parent | 8b504db309c3b08e8ba7bd425a5fa29c29d8a4d5 (diff) | |
| download | git-20d16da5caf85801b8b606e2c9a3fa8a5c261e64.tar.gz git-20d16da5caf85801b8b606e2c9a3fa8a5c261e64.tar.xz | |
Merge branch 'qn/blame-show-email'
"git blame" learned blame.showEmail configuration variable.
* qn/blame-show-email:
blame: add blame.showEmail configuration
Diffstat (limited to 'builtin/blame.c')
| -rw-r--r-- | builtin/blame.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/builtin/blame.c b/builtin/blame.c index b3e948e75..a22ac1740 100644 --- a/builtin/blame.c +++ b/builtin/blame.c @@ -2176,6 +2176,14 @@ static int git_blame_config(const char *var, const char *value, void *cb) blank_boundary = git_config_bool(var, value); return 0; } + if (!strcmp(var, "blame.showemail")) { + int *output_option = cb; + if (git_config_bool(var, value)) + *output_option |= OUTPUT_SHOW_EMAIL; + else + *output_option &= ~OUTPUT_SHOW_EMAIL; + return 0; + } if (!strcmp(var, "blame.date")) { if (!value) return config_error_nonbool(var); @@ -2520,7 +2528,7 @@ int cmd_blame(int argc, const char **argv, const char *prefix) unsigned int range_i; long anchor; - git_config(git_blame_config, NULL); + git_config(git_blame_config, &output_option); init_revisions(&revs, NULL); revs.date_mode = blame_date_mode; DIFF_OPT_SET(&revs.diffopt, ALLOW_TEXTCONV); |