diff options
| author | Jiang Xin <worldhello.net@gmail.com> | 2012-03-16 12:18:07 (GMT) |
|---|---|---|
| committer | Jiang Xin <worldhello.net@gmail.com> | 2012-03-16 12:18:07 (GMT) |
| commit | d90b16ed421eb51fc4d7c6bda5f3332cc2e3aece (patch) | |
| tree | 2d90d25ecbe794492f0fb267f31af8a1f646327d /builtin/verify-tag.c | |
| parent | 6672dc8e694f412090417a95cd6cd4b2b5be6da1 (diff) | |
| parent | 0e2d57fd50f61e668be3180bc8f25991ea88aa8c (diff) | |
| download | git-d90b16ed421eb51fc4d7c6bda5f3332cc2e3aece.zip git-d90b16ed421eb51fc4d7c6bda5f3332cc2e3aece.tar.gz git-d90b16ed421eb51fc4d7c6bda5f3332cc2e3aece.tar.bz2 | |
Merge v1.7.10-rc0 for git l10n update
Diffstat (limited to 'builtin/verify-tag.c')
| -rw-r--r-- | builtin/verify-tag.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/builtin/verify-tag.c b/builtin/verify-tag.c index 28c2174..986789f 100644 --- a/builtin/verify-tag.c +++ b/builtin/verify-tag.c @@ -58,6 +58,14 @@ static int verify_tag(const char *name, int verbose) return ret; } +static int git_verify_tag_config(const char *var, const char *value, void *cb) +{ + int status = git_gpg_config(var, value, cb); + if (status) + return status; + return git_default_config(var, value, cb); +} + int cmd_verify_tag(int argc, const char **argv, const char *prefix) { int i = 1, verbose = 0, had_error = 0; @@ -66,7 +74,7 @@ int cmd_verify_tag(int argc, const char **argv, const char *prefix) OPT_END() }; - git_config(git_default_config, NULL); + git_config(git_verify_tag_config, NULL); argc = parse_options(argc, argv, prefix, verify_tag_options, verify_tag_usage, PARSE_OPT_KEEP_ARGV0); |