summaryrefslogtreecommitdiff
path: root/builtin/blame.c
diff options
context:
space:
mode:
authorQuentin Neill <quentin.neill@gmail.com>2015-05-31 19:27:37 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-06-01 22:50:43 (GMT)
commit8b504db309c3b08e8ba7bd425a5fa29c29d8a4d5 (patch)
tree0ac3f5e8ae26e4aa23a1baff4db057fb8c6d12d7 /builtin/blame.c
parent3d4a3ffe64162b45ae7c991fc60623ecb4678cfd (diff)
downloadgit-8b504db309c3b08e8ba7bd425a5fa29c29d8a4d5.zip
git-8b504db309c3b08e8ba7bd425a5fa29c29d8a4d5.tar.gz
git-8b504db309c3b08e8ba7bd425a5fa29c29d8a4d5.tar.bz2
blame: add blame.showEmail configuration
Complement existing --show-email option with fallback configuration variable, with tests. Signed-off-by: Quentin Neill <quentin.neill@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/blame.c')
-rw-r--r--builtin/blame.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/builtin/blame.c b/builtin/blame.c
index 06484c2..b361b57 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);