diff options
| author | Jacob Sarvis <jsarvis@openspan.com> | 2013-03-27 10:13:39 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-03-27 13:57:12 -0700 |
| commit | 6005dbb9bf21d10b209f7924e305bd04b9ab56d2 (patch) | |
| tree | 039aa6c793c0b75cdd15c07ef0815914c1892b2e /builtin/log.c | |
| parent | 2bba2f0e6542d541e9f27653d8c9d5fc8d0e679c (diff) | |
| download | git-6005dbb9bf21d10b209f7924e305bd04b9ab56d2.tar.gz | |
log: read gpg settings for signed commit verification
"show --show-signature" and "log --show-signature" do not read the
gpg.program setting from git config, even though, commit signing,
tag signing, and tag verification honor it.
Signed-off-by: Jacob Sarvis <jsarvis@openspan.com>
Signed-off-by: Hans Brigman <hbrigman@openspan.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/log.c')
| -rw-r--r-- | builtin/log.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/builtin/log.c b/builtin/log.c index 8f0b2e84fe..6987a9f2d9 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -23,6 +23,7 @@ #include "streaming.h" #include "version.h" #include "mailmap.h" +#include "gpg-interface.h" /* Set a default date-time format for git log ("log.date" config variable) */ static const char *default_date_mode = NULL; @@ -367,6 +368,8 @@ static int git_log_config(const char *var, const char *value, void *cb) if (grep_config(var, value, cb) < 0) return -1; + if (git_gpg_config(var, value, cb) < 0) + return -1; return git_diff_ui_config(var, value, cb); } |