X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin-verify-tag.c;h=92eaa89a45eff2e76e531a914bdccca5fafe98b0;hb=d88593fa0412a4f0a363860d879e97635c118616;hp=cc4c55d7ee35ceeaf8c4a857d5dad857a7eb2664;hpb=317efa63fc457d1a726902ddf97298c201df627c;p=git.git

diff --git a/builtin-verify-tag.c b/builtin-verify-tag.c
index cc4c55d7e..92eaa89a4 100644
--- a/builtin-verify-tag.c
+++ b/builtin-verify-tag.c
@@ -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);
@@ -90,7 +90,7 @@ 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);
+	git_config(git_default_config, NULL);
 
 	if (argc == 1)
 		usage(builtin_verify_tag_usage);