summaryrefslogtreecommitdiff
path: root/builtin-write-tree.c
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2006-07-08 08:56:28 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-07-08 10:28:19 (GMT)
commit6244b24906f9efa4c1d573fa79e73eaf8e557551 (patch)
tree399a1683ca0fdfe776af3e86b05862257bea0417 /builtin-write-tree.c
parenta0c2089c1d48dc9969822126170d35c6e5aa141f (diff)
downloadgit-6244b24906f9efa4c1d573fa79e73eaf8e557551.zip
git-6244b24906f9efa4c1d573fa79e73eaf8e557551.tar.gz
git-6244b24906f9efa4c1d573fa79e73eaf8e557551.tar.bz2
Close the index file between writing and committing
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'builtin-write-tree.c')
-rw-r--r--builtin-write-tree.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin-write-tree.c b/builtin-write-tree.c
index 70e9b6f..449a4d1 100644
--- a/builtin-write-tree.c
+++ b/builtin-write-tree.c
@@ -35,7 +35,8 @@ int write_tree(unsigned char *sha1, int missing_ok, const char *prefix)
missing_ok, 0) < 0)
die("git-write-tree: error building trees");
if (0 <= newfd) {
- if (!write_cache(newfd, active_cache, active_nr))
+ if (!write_cache(newfd, active_cache, active_nr)
+ && !close(newfd))
commit_lock_file(lock_file);
}
/* Not being able to write is fine -- we are only interested