summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-03-12 22:55:53 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-03-12 22:55:54 (GMT)
commit57cec0aec77eb33bfc1eaaa5fb128f8799bbae43 (patch)
treebc7fa8507546c68c0352844d74c590ec94337563
parent3101a748dc23a9214db68cc2d0fc81064d54b9ea (diff)
parenta2c25061aa2cfa2f60d092a5b7bc9c00c4beca90 (diff)
downloadgit-57cec0aec77eb33bfc1eaaa5fb128f8799bbae43.zip
git-57cec0aec77eb33bfc1eaaa5fb128f8799bbae43.tar.gz
git-57cec0aec77eb33bfc1eaaa5fb128f8799bbae43.tar.bz2
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.c10
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);