path: root/builtin-rm.c
diff options
authorJunio C Hamano <>2006-06-06 19:51:49 (GMT)
committerJunio C Hamano <>2006-06-06 21:30:58 (GMT)
commit021b6e454944a4fba878651ebf9bfe0a3f6c3077 (patch)
tree125f7ae01b9c959782e345baa03c7c786cc3f4ce /builtin-rm.c
parentdd8239f997962d94162790039b008acb6068a242 (diff)
Make index file locking code reusable to others.
The framework to create lockfiles that are removed at exit is first used to reliably write the index file, but it is applicable to other things, so stop calling it "cache_file". This also rewords a few remaining error message that called the index file "cache file". Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'builtin-rm.c')
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin-rm.c b/builtin-rm.c
index e7793a2..ef2f8b5 100644
--- a/builtin-rm.c
+++ b/builtin-rm.c
@@ -41,7 +41,7 @@ static int remove_file(const char *name)
return ret;
-static struct cache_file cache_file;
+static struct lock_file lock_file;
int cmd_rm(int argc, const char **argv, char **envp)
@@ -53,7 +53,7 @@ int cmd_rm(int argc, const char **argv, char **envp)
- newfd = hold_index_file_for_update(&cache_file, get_index_file());
+ newfd = hold_lock_file_for_update(&lock_file, get_index_file());
if (newfd < 0)
die("unable to create new index file");
@@ -144,7 +144,7 @@ int cmd_rm(int argc, const char **argv, char **envp)
if (active_cache_changed) {
if (write_cache(newfd, active_cache, active_nr) ||
- commit_index_file(&cache_file))
+ commit_lock_file(&lock_file))
die("Unable to write new index file");