X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=builtin-rm.c;h=ef2f8b5d099555c259a39985d8e765cf378e4431;hb=021b6e454944a4fba878651ebf9bfe0a3f6c3077;hp=e7793a20f5c38ff31d4a74b7e1cec50b9a9f252e;hpb=dd8239f997962d94162790039b008acb6068a242;p=git.git

diff --git a/builtin-rm.c b/builtin-rm.c
index e7793a20..ef2f8b5d 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)
 
 	git_config(git_default_config);
 
-	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");
 	}