Merge branch 'js/log-gpg'
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
This commit is contained in:
commit
68ef16b848
@ -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);
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user