Skip to content

Commit

Permalink
verify-tag: Parse GPG configuration options.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Alex Zepeda authored and Junio C Hamano committed Mar 8, 2012
1 parent 828ea97 commit a2c2506
Showing 1 changed file with 9 additions and 1 deletion.
10 changes: 9 additions & 1 deletion builtin/verify-tag.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);
Expand Down

0 comments on commit a2c2506

Please sign in to comment.