verify-tag: Parse GPG configuration options.
Modify verify-tag to load relevant GPG variables from the git configuratio file. This allows git tag -v to use an alternative GPG binary in the same way that git tag -s does. Signed-off-by: Alex Zepeda <alex@inferiorhumanorgans.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:

committed by
Junio C Hamano

parent
828ea97de4
commit
a2c25061aa
@ -58,6 +58,14 @@ static int verify_tag(const char *name, int verbose)
|
|||||||
return ret;
|
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 cmd_verify_tag(int argc, const char **argv, const char *prefix)
|
||||||
{
|
{
|
||||||
int i = 1, verbose = 0, had_error = 0;
|
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()
|
OPT_END()
|
||||||
};
|
};
|
||||||
|
|
||||||
git_config(git_default_config, NULL);
|
git_config(git_verify_tag_config, NULL);
|
||||||
|
|
||||||
argc = parse_options(argc, argv, prefix, verify_tag_options,
|
argc = parse_options(argc, argv, prefix, verify_tag_options,
|
||||||
verify_tag_usage, PARSE_OPT_KEEP_ARGV0);
|
verify_tag_usage, PARSE_OPT_KEEP_ARGV0);
|
||||||
|
Reference in New Issue
Block a user