diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-07-11 10:31:08 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-07-11 10:31:08 -0700 |
| commit | 369dc4081c836bc17ee1debaf6688eb098359760 (patch) | |
| tree | 89e24346a55c464332e169c8e8306669cc03b323 /builtin | |
| parent | Merge branch 'js/find-commit-subject-ignore-leading-blanks' (diff) | |
| parent | log: add log.showSignature configuration variable (diff) | |
| download | tgif-369dc4081c836bc17ee1debaf6688eb098359760.tar.xz | |
Merge branch 'mj/log-show-signature-conf'
"git log" learns log.showSignature configuration variable, and a
command line option "--no-show-signature" to countermand it.
* mj/log-show-signature-conf:
log: add log.showSignature configuration variable
log: add "--no-show-signature" command line option
t4202: refactor test
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/log.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/builtin/log.c b/builtin/log.c index de47b4e89a..0b6f7392b9 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -33,6 +33,7 @@ static const char *default_date_mode = NULL; static int default_abbrev_commit; static int default_show_root = 1; static int default_follow; +static int default_show_signature; static int decoration_style; static int decoration_given; static int use_mailmap_config; @@ -119,6 +120,7 @@ static void cmd_log_init_defaults(struct rev_info *rev) rev->abbrev_commit = default_abbrev_commit; rev->show_root_diff = default_show_root; rev->subject_prefix = fmt_patch_subject_prefix; + rev->show_signature = default_show_signature; DIFF_OPT_SET(&rev->diffopt, ALLOW_TEXTCONV); if (default_date_mode) @@ -409,6 +411,10 @@ static int git_log_config(const char *var, const char *value, void *cb) use_mailmap_config = git_config_bool(var, value); return 0; } + if (!strcmp(var, "log.showsignature")) { + default_show_signature = git_config_bool(var, value); + return 0; + } if (grep_config(var, value, cb) < 0) return -1; |