Skip to content

Commit

Permalink
log: read gpg settings for signed commit verification
Browse files Browse the repository at this point in the history
"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>
  • Loading branch information
Jacob Sarvis authored and Junio C Hamano committed Mar 27, 2013
1 parent 2bba2f0 commit 6005dbb
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions builtin/log.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
}

Expand Down

0 comments on commit 6005dbb

Please sign in to comment.