From: Hans Brigman Date: Mon, 25 Mar 2013 18:03:52 GMT Subject: [PATCH] log: make "show --show-signature" use gpg.program setting Message-ID: <8C726954D36902459248B0627BF2E66F45D7029930@AUSP01VMBX10.collaborationhost.net> "show --show-signature" doesn't currently use the gpg.program setting. Commit signing, tag signing, and tag verification currently use this setting properly, so the logic has been added to handle it here as well. Signed-off-by: Hans Brigman --- builtin/log.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/builtin/log.c b/builtin/log.c index 8f0b2e8..a6c5576 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 (!prefixcmp(var, "gpg.")) + return git_gpg_config(var, value, NULL); if (grep_config(var, value, cb) < 0) return -1; return git_diff_ui_config(var, value, cb); -- 1.7.11.msysgit.0 From 5e0b3de93e90750ea8d3f5c897861886647672b4 Mon Sep 17 00:00:00 2001 From: Hans Brigman Date: Fri, 22 Mar 2013 16:41:06 -0400 Subject: [PATCH] log: make "show --show-signature" use gpg.program setting "show --show-signature" doesn't currently use the gpg.program setting. Commit signing, tag signing, and tag verification currently use this setting properly, so the logic has been added to handle it here as well. Signed-off-by: Hans Brigman --- builtin/log.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/builtin/log.c b/builtin/log.c index 8f0b2e8..a6c5576 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 (!prefixcmp(var, "gpg.")) + return git_gpg_config(var, value, NULL); if (grep_config(var, value, cb) < 0) return -1; return git_diff_ui_config(var, value, cb); -- 1.7.11.msysgit.0