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 <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
Alex Riesen committed
Apr 26, 2007 at 00:28 UTC
c21aa54e190e6527f05a2a943b343032e9dac90b
1 file changed
+5
-1
builtin-write-tree.c
+5
-1
@@ -36,8 +36,10 @@ int write_tree(unsigned char *sha1, int missing_ok, const char *prefix)
36
die("git-write-tree: error building trees");
37
if (0 <= newfd) {
38
if (!write_cache(newfd, active_cache, active_nr)
39
- && !close(newfd))
39
+ && !close(newfd)) {
40
commit_lock_file(lock_file);
41
+ newfd = -1;
42
+ }
43
}
44
/* Not being able to write is fine -- we are only interested
45
* 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)
57
else
58
hashcpy(sha1, active_cache_tree->sha1);
59
60
+ if (0 <= newfd)
61
+ close(newfd);
62
rollback_lock_file(lock_file);
63
64
return 0;