Skip to content

Commit

Permalink
Merge branch 'js/log-gpg'
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Junio C Hamano committed Apr 2, 2013
2 parents 48799d1 + 6005dbb commit 68ef16b
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 68ef16b

Please sign in to comment.