Skip to content

Commit 68ef16b

Browse files
committed
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
2 parents 48799d1 + 6005dbb commit 68ef16b

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

builtin/log.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
#include "streaming.h"
2424
#include "version.h"
2525
#include "mailmap.h"
26+
#include "gpg-interface.h"
2627

2728
/* Set a default date-time format for git log ("log.date" config variable) */
2829
static const char *default_date_mode = NULL;
@@ -367,6 +368,8 @@ static int git_log_config(const char *var, const char *value, void *cb)
367368

368369
if (grep_config(var, value, cb) < 0)
369370
return -1;
371+
if (git_gpg_config(var, value, cb) < 0)
372+
return -1;
370373
return git_diff_ui_config(var, value, cb);
371374
}
372375

0 commit comments

Comments
 (0)