From 8b504db309c3b08e8ba7bd425a5fa29c29d8a4d5 Mon Sep 17 00:00:00 2001 From: Quentin Neill Date: Sun, 31 May 2015 14:27:37 -0500 Subject: blame: add blame.showEmail configuration Complement existing --show-email option with fallback configuration variable, with tests. Signed-off-by: Quentin Neill Signed-off-by: Junio C Hamano --- builtin/blame.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'builtin/blame.c') diff --git a/builtin/blame.c b/builtin/blame.c index 06484c2e0..b361b5739 100644 --- a/builtin/blame.c +++ b/builtin/blame.c @@ -2185,6 +2185,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); @@ -2528,7 +2536,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); -- cgit v1.2.1