summaryrefslogtreecommitdiff
path: root/builtin/log.c
diff options
context:
space:
mode:
authorJacob Sarvis <jsarvis@openspan.com>2013-03-27 15:13:39 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-03-27 20:57:12 (GMT)
commit6005dbb9bf21d10b209f7924e305bd04b9ab56d2 (patch)
tree039aa6c793c0b75cdd15c07ef0815914c1892b2e /builtin/log.c
parent2bba2f0e6542d541e9f27653d8c9d5fc8d0e679c (diff)
downloadgit-6005dbb9bf21d10b209f7924e305bd04b9ab56d2.zip
git-6005dbb9bf21d10b209f7924e305bd04b9ab56d2.tar.gz
git-6005dbb9bf21d10b209f7924e305bd04b9ab56d2.tar.bz2
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.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/builtin/log.c b/builtin/log.c
index 8f0b2e8..6987a9f 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);
}