From: Alex Riesen Date: Wed, 25 Apr 2007 22:28:17 +0000 (+0200) Subject: Fix handle leak in write_tree X-Git-Tag: v1.5.1.3~36 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=c21aa54e190e6527f05a2a943b343032e9dac90b;p=git.git Fix handle leak in write_tree This is a quick and dirty fix for the broken "git cherry-pick -n" on some broken OS, which does not remove the directory entry after unlink succeeded(!) if the file is still open somewher. The entry is left but "protected": no open, no unlink, no stat. Very annoying. Signed-off-by: Alex Riesen Signed-off-by: Junio C Hamano --- diff --git a/builtin-write-tree.c b/builtin-write-tree.c index 90fc1cfcf..a1894814f 100644 --- a/builtin-write-tree.c +++ b/builtin-write-tree.c @@ -36,8 +36,10 @@ int write_tree(unsigned char *sha1, int missing_ok, const char *prefix) die("git-write-tree: error building trees"); if (0 <= newfd) { if (!write_cache(newfd, active_cache, active_nr) - && !close(newfd)) + && !close(newfd)) { commit_lock_file(lock_file); + newfd = -1; + } } /* Not being able to write is fine -- we are only interested * in updating the cache-tree part, and if the next caller @@ -55,6 +57,8 @@ int write_tree(unsigned char *sha1, int missing_ok, const char *prefix) else hashcpy(sha1, active_cache_tree->sha1); + if (0 <= newfd) + close(newfd); rollback_lock_file(lock_file); return 0;