X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin-verify-tag.c;h=db81496b464e253341a42e01eb72d6845e87199c;hb=37a75abc985a25a0612c2c176ed35d438722752d;hp=dfcfcd0455ce471a6120d11bcbdb7553de59f536;hpb=5071877d2c623ffc41b48bbb49908a61051a6228;p=git.git

diff --git a/builtin-verify-tag.c b/builtin-verify-tag.c
index dfcfcd045..db81496b4 100644
--- a/builtin-verify-tag.c
+++ b/builtin-verify-tag.c
@@ -35,7 +35,7 @@ static int run_gpg_verify(const char *buf, unsigned long size, int verbose)
 
 	/* find the length without signature */
 	len = 0;
-	while (len < size && prefixcmp(buf + len, PGP_SIGNATURE "\n")) {
+	while (len < size && prefixcmp(buf + len, PGP_SIGNATURE)) {
 		eol = memchr(buf + len, '\n', size - len);
 		len += eol ? eol - (buf + len) + 1 : size - len;
 	}
@@ -45,14 +45,14 @@ static int run_gpg_verify(const char *buf, unsigned long size, int verbose)
 	memset(&gpg, 0, sizeof(gpg));
 	gpg.argv = args_gpg;
 	gpg.in = -1;
-	gpg.out = 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);
-	gpg.close_in = 0;
 	ret = finish_command(&gpg);
 
 	unlink(path);