X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=builtin-rm.c;h=ef2f8b5d099555c259a39985d8e765cf378e4431;hb=74237d6236d7e32f69469ff26df3f3bb3875f523;hp=0beb86dc3dd13610da14afe77c96a2a1ea34573b;hpb=93872e07008510340eec951f0d037f7b3a0b8567;p=git.git

diff --git a/builtin-rm.c b/builtin-rm.c
index 0beb86dc..ef2f8b5d 100644
--- a/builtin-rm.c
+++ b/builtin-rm.c
@@ -6,6 +6,7 @@
 #include "cache.h"
 #include "builtin.h"
 #include "dir.h"
+#include "cache-tree.h"
 
 static const char builtin_rm_usage[] =
 "git-rm [-n] [-v] [-f] <filepattern>...";
@@ -40,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)
 {
@@ -52,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");
 
@@ -143,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");
 	}