From 6244b24906f9efa4c1d573fa79e73eaf8e557551 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Sat, 8 Jul 2006 10:56:28 +0200 Subject: [PATCH] Close the index file between writing and committing Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano --- builtin-add.c | 2 +- builtin-apply.c | 2 +- builtin-read-tree.c | 2 +- builtin-rm.c | 2 +- builtin-update-index.c | 2 +- builtin-write-tree.c | 3 ++- checkout-index.c | 2 +- 7 files changed, 8 insertions(+), 7 deletions(-) diff --git a/builtin-add.c b/builtin-add.c index bfbbb1bf5..2d2569817 100644 --- a/builtin-add.c +++ b/builtin-add.c @@ -181,7 +181,7 @@ int cmd_add(int argc, const char **argv, char **envp) if (active_cache_changed) { if (write_cache(newfd, active_cache, active_nr) || - commit_lock_file(&lock_file)) + close(newfd) || commit_lock_file(&lock_file)) die("Unable to write new index file"); } diff --git a/builtin-apply.c b/builtin-apply.c index e9ead002d..c3af48917 100644 --- a/builtin-apply.c +++ b/builtin-apply.c @@ -2323,7 +2323,7 @@ int cmd_apply(int argc, const char **argv, char **envp) if (write_index) { if (write_cache(newfd, active_cache, active_nr) || - commit_lock_file(&lock_file)) + close(newfd) || commit_lock_file(&lock_file)) die("Unable to write new index file"); } diff --git a/builtin-read-tree.c b/builtin-read-tree.c index 9a2099d73..23a8d92a4 100644 --- a/builtin-read-tree.c +++ b/builtin-read-tree.c @@ -1038,7 +1038,7 @@ int cmd_read_tree(int argc, const char **argv, char **envp) } if (write_cache(newfd, active_cache, active_nr) || - commit_lock_file(&lock_file)) + close(newfd) || commit_lock_file(&lock_file)) die("unable to write new index file"); return 0; } diff --git a/builtin-rm.c b/builtin-rm.c index 4d56a1f07..875d8252f 100644 --- a/builtin-rm.c +++ b/builtin-rm.c @@ -147,7 +147,7 @@ int cmd_rm(int argc, const char **argv, char **envp) if (active_cache_changed) { if (write_cache(newfd, active_cache, active_nr) || - commit_lock_file(&lock_file)) + close(newfd) || commit_lock_file(&lock_file)) die("Unable to write new index file"); } diff --git a/builtin-update-index.c b/builtin-update-index.c index ef5024345..1a4200d15 100644 --- a/builtin-update-index.c +++ b/builtin-update-index.c @@ -648,7 +648,7 @@ int cmd_update_index(int argc, const char **argv, char **envp) finish: if (active_cache_changed) { if (write_cache(newfd, active_cache, active_nr) || - commit_lock_file(lock_file)) + close(newfd) || commit_lock_file(lock_file)) die("Unable to write new index file"); } diff --git a/builtin-write-tree.c b/builtin-write-tree.c index 70e9b6fcc..449a4d1b5 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 diff --git a/checkout-index.c b/checkout-index.c index ea40bc29b..292795550 100644 --- a/checkout-index.c +++ b/checkout-index.c @@ -311,7 +311,7 @@ int main(int argc, char **argv) if (0 <= newfd && (write_cache(newfd, active_cache, active_nr) || - commit_lock_file(&lock_file))) + close(newfd) || commit_lock_file(&lock_file))) die("Unable to write new index file"); return 0; } -- 2.30.2