From 960175cb3326a12e038805121edbdc8119fbb104 Mon Sep 17 00:00:00 2001 From: Jacob Sarvis Date: Fri, 22 Mar 2013 12:54:32 -0400 Subject: [PATCH 1/2] log: Read gpg settings for signed commit verification Commit signature verification fails when alternative gpg.program signs the commit, but gpg attempts to verify the signature. "show --show-signature" and "log --show-signature" do not read the gpg.program setting from git config. Commit signing, tag signing, and tag verification use this setting properly. Make log and show commands pass through settings to gpg interface. Signed-off-by: Jacob Sarvis --- builtin/log.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/builtin/log.c b/builtin/log.c index 8f0b2e8..31f5a9e 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; @@ -364,7 +365,8 @@ static int git_log_config(const char *var, const char *value, void *cb) use_mailmap_config = git_config_bool(var, value); return 0; } - + if (git_gpg_config(var, value, cb) < 0) + return -1; if (grep_config(var, value, cb) < 0) return -1; return git_diff_ui_config(var, value, cb); -- 1.7.11.msysgit.0