aboutsummaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-01-18 21:37:06 -0800
committerJunio C Hamano <gitster@pobox.com>2010-01-18 21:37:06 -0800
commit814035c12a07927ea03350184a14f869cdce7276 (patch)
tree2bd7e76205be964e7379cc2d9fd2e7dc71003599 /diff.c
parent18d97f5fedc4e464fa9b5d8096b5a9f7e42364fa (diff)
parent011c181cc656c8b3e48882729d1b6238e8c5c537 (diff)
downloadgit-814035c12a07927ea03350184a14f869cdce7276.tar.gz
git-814035c12a07927ea03350184a14f869cdce7276.tar.xz
Merge branch 'maint-1.6.3' into maint-1.6.4
* maint-1.6.3: base85: Make the code more obvious instead of explaining the non-obvious base85: encode_85() does not use the decode table base85 debug code: Fix length byte calculation checkout -m: do not try to fall back to --merge from an unborn branch branch: die explicitly why when calling "git branch [-a|-r] branchname". 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
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 cd35e0c2d..6f3bd8597 100644
--- a/diff.c
+++ b/diff.c
@@ -3597,11 +3597,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);