mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'js/log-gpg'

Browse Source 
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:
Junio C Hamano
2013-04-02 15:10:49 -07:00
parent 48799d1c6b 6005dbb9bf
commit 68ef16b848
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
builtin/log.c
View File

@ -23,6 +23,7 @@
#include "streaming.h" #include "streaming.h"
#include "version.h" #include "version.h"
#include "mailmap.h" #include "mailmap.h"
#include "gpg-interface.h"
/* Set a default date-time format for git log ("log.date" config variable) */ /* Set a default date-time format for git log ("log.date" config variable) */
static const char *default_date_mode = NULL; 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) if (grep_config(var, value, cb) < 0)
return -1; return -1;
if (git_gpg_config(var, value, cb) < 0)
return -1;
return git_diff_ui_config(var, value, cb); return git_diff_ui_config(var, value, cb);
} }