Skip to content

Commit

Permalink
verify-tag: migrate to parse-options
Browse files Browse the repository at this point in the history
Signed-off-by: Stephen Boyd <bebarino@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Stephen Boyd authored and Junio C Hamano committed Jul 11, 2009
1 parent 404d42e commit 4855b2a
Showing 1 changed file with 12 additions and 9 deletions.
21 changes: 12 additions & 9 deletions builtin-verify-tag.c
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,12 @@
#include "tag.h"
#include "run-command.h"
#include <signal.h>
#include "parse-options.h"

static const char builtin_verify_tag_usage[] =
"git verify-tag [-v|--verbose] <tag>...";
static const char * const verify_tag_usage[] = {
"git verify-tag [-v|--verbose] <tag>...",
NULL
};

#define PGP_SIGNATURE "-----BEGIN PGP SIGNATURE-----"

Expand Down Expand Up @@ -89,17 +92,17 @@ static int verify_tag(const char *name, int verbose)
int cmd_verify_tag(int argc, const char **argv, const char *prefix)
{
int i = 1, verbose = 0, had_error = 0;
const struct option verify_tag_options[] = {
OPT__VERBOSE(&verbose),
OPT_END()
};

git_config(git_default_config, NULL);

if (argc > 1 &&
(!strcmp(argv[i], "-v") || !strcmp(argv[i], "--verbose"))) {
verbose = 1;
i++;
}

argc = parse_options(argc, argv, prefix, verify_tag_options,
verify_tag_usage, PARSE_OPT_KEEP_ARGV0);
if (argc <= i)
usage(builtin_verify_tag_usage);
usage_with_options(verify_tag_usage, verify_tag_options);

/* sometimes the program was terminated because this signal
* was received in the process of writing the gpg input: */
Expand Down

0 comments on commit 4855b2a

Please sign in to comment.