From: Olivier Marin <dkr@freesurf.fr>
Date: Mon, 28 Jul 2008 10:48:44 +0000 (+0200)
Subject: builtin-verify-tag: fix -v option parsing
X-Git-Tag: v1.6.0-rc2~65
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d2761895144b6fabcbe1f3bd40d6c6798914b518;p=git.git

builtin-verify-tag: fix -v option parsing

Since the C rewrite, "git verify-tag -v" just does nothing instead of
printing the usage message with an error. This patch fix the regression.

Signed-off-by: Olivier Marin <dkr@freesurf.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/builtin-verify-tag.c b/builtin-verify-tag.c
index 7d837f0f9..729a1593e 100644
--- a/builtin-verify-tag.c
+++ b/builtin-verify-tag.c
@@ -92,14 +92,15 @@ int cmd_verify_tag(int argc, const char **argv, const char *prefix)
 
 	git_config(git_default_config, NULL);
 
-	if (argc == 1)
-		usage(builtin_verify_tag_usage);
-
-	if (!strcmp(argv[i], "-v") || !strcmp(argv[i], "--verbose")) {
+	if (argc > 1 &&
+	    (!strcmp(argv[i], "-v") || !strcmp(argv[i], "--verbose"))) {
 		verbose = 1;
 		i++;
 	}
 
+	if (argc <= i)
+		usage(builtin_verify_tag_usage);
+
 	/* sometimes the program was terminated because this signal
 	 * was received in the process of writing the gpg input: */
 	signal(SIGPIPE, SIG_IGN);