From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 7 Feb 2013 23:14:54 +0000 (-0800)
Subject: Merge branch 'sb/gpg-plug-fd-leak' into maint
X-Git-Tag: v1.8.1.3~5
X-Git-Url: https://www.git.lorimer.id.au/gitweb.git/diff_plain/d2216a4b133f90a543a0e4c4a9f9809a043012d6?hp=427c6d0caf0caee5ad2c4925910a6b8ebcf95408

Merge branch 'sb/gpg-plug-fd-leak' into maint

We forgot to close the file descriptor reading from "gpg" output,
killing "git log --show-signature" on a long history.

* sb/gpg-plug-fd-leak:
gpg: close stderr once finished with it in verify_signed_buffer()
---

diff --git a/gpg-interface.c b/gpg-interface.c
index 0863c61800..5f142f6198 100644
--- a/gpg-interface.c
+++ b/gpg-interface.c
@@ -130,8 +130,10 @@ int verify_signed_buffer(const char *payload, size_t payload_size,
 	write_in_full(gpg.in, payload, payload_size);
 	close(gpg.in);
 
-	if (gpg_output)
+	if (gpg_output) {
 		strbuf_read(gpg_output, gpg.err, 0);
+		close(gpg.err);
+	}
 	ret = finish_command(&gpg);
 
 	unlink_or_warn(path);