aboutsummaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-12-30 01:24:12 -0800
committerJunio C Hamano <gitster@pobox.com>2009-12-30 01:24:12 -0800
commitb0b3a241e2ca1ba5b928a128b6dcafb990df6e75 (patch)
treef0631396a9ce6a1bdd3ef12f2c87cd47a7864cea /diff.c
parentf5e025a9d5b35e24768475f6890b836ce0d5ed15 (diff)
parent70d7099916c9621e157c620f9cc7fc982f109c55 (diff)
downloadgit-b0b3a241e2ca1ba5b928a128b6dcafb990df6e75.tar.gz
git-b0b3a241e2ca1ba5b928a128b6dcafb990df6e75.tar.xz
Merge branch 'maint-1.6.1' into maint
* maint-1.6.1: textconv: stop leaking file descriptors commit: --cleanup is a message option git count-objects: handle packs bigger than 4G t7102: make the test fail if one of its check fails Conflicts: builtin-commit.c diff.c
Diffstat (limited to 'diff.c')
-rw-r--r--diff.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/diff.c b/diff.c
index 08bbd3e90..6da52e0c4 100644
--- a/diff.c
+++ b/diff.c
@@ -3776,11 +3776,13 @@ static char *run_textconv(const char *pgm, struct diff_filespec *spec,
if (start_command(&child) != 0 ||
strbuf_read(&buf, child.out, 0) < 0 ||
finish_command(&child) != 0) {
+ close(child.out);
strbuf_release(&buf);
remove_tempfile();
error("error running textconv command '%s'", pgm);
return NULL;
}
+ close(child.out);
remove_tempfile();
return strbuf_detach(&buf, outsize);