X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin-verify-tag.c;h=729a1593e61d87ad4596f07e7faedac81de64e81;hb=39702431500b76425f047209c9e9b2aae7e92b00;hp=f3ef11fa2d582682b428d6e165da65f05e2d7511;hpb=319a36a5c2da8dd07993caac43b7820bff3b0d37;p=git.git

diff --git a/builtin-verify-tag.c b/builtin-verify-tag.c
index f3ef11fa2..729a1593e 100644
--- a/builtin-verify-tag.c
+++ b/builtin-verify-tag.c
@@ -12,7 +12,7 @@
 #include <signal.h>
 
 static const char builtin_verify_tag_usage[] =
-		"git-verify-tag [-v|--verbose] <tag>...";
+		"git verify-tag [-v|--verbose] <tag>...";
 
 #define PGP_SIGNATURE "-----BEGIN PGP SIGNATURE-----"
 
@@ -46,8 +46,10 @@ static int run_gpg_verify(const char *buf, unsigned long size, int verbose)
 	gpg.argv = args_gpg;
 	gpg.in = -1;
 	args_gpg[2] = path;
-	if (start_command(&gpg))
+	if (start_command(&gpg)) {
+		unlink(path);
 		return error("could not run gpg.");
+	}
 
 	write_in_full(gpg.in, buf, len);
 	close(gpg.in);
@@ -88,16 +90,17 @@ int cmd_verify_tag(int argc, const char **argv, const char *prefix)
 {
 	int i = 1, verbose = 0, had_error = 0;
 
-	git_config(git_default_config);
-
-	if (argc == 1)
-		usage(builtin_verify_tag_usage);
+	git_config(git_default_config, NULL);
 
-	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);