diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-04-03 02:10:49 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-03 02:10:49 +0400 |
| commit | 68ef16b8488da1a9eed241340af194979d328ba7 (patch) | |
| tree | cbc8de21d18cc473c503b08f0d6d3731652e440e /builtin/log.c | |
| parent | 48799d1c6b9cfb0279afbfe3420cbcd53c24907c (diff) | |
| parent | 6005dbb9bf21d10b209f7924e305bd04b9ab56d2 (diff) | |
Merge branch 'js/log-gpg'
Teach "show/log" honor gpg.program configuration just like other
parts of the code that use GnuPG.
* js/log-gpg:
log: read gpg settings for signed commit verification
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 59de484bc2..0f318107e5 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); } |