Document git-ls-tree --fullname
[gitweb.git] / builtin-rm.c
index e7793a20f5c38ff31d4a74b7e1cec50b9a9f252e..ef2f8b5d099555c259a39985d8e765cf378e4431 100644 (file)
@@ -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");
        }