diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-03-12 15:55:53 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-03-12 15:55:54 -0700 |
| commit | 57cec0aec77eb33bfc1eaaa5fb128f8799bbae43 (patch) | |
| tree | bc7fa8507546c68c0352844d74c590ec94337563 | |
| parent | Sync with 1.7.9.4 (diff) | |
| parent | verify-tag: Parse GPG configuration options. (diff) | |
| download | tgif-57cec0aec77eb33bfc1eaaa5fb128f8799bbae43.tar.xz | |
Merge branch 'az/verify-tag-use-gpg-config'
"git tag -s" honored "gpg.program" configuration variable since
1.7.9, but "git tag -v" and "git verify-tag" didn't.
By Alex Zepeda
* az/verify-tag-use-gpg-config:
verify-tag: Parse GPG configuration options.
| -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 28c2174338..986789f706 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); |