X-Git-Url: https://git.octo.it/?p=git.git;a=blobdiff_plain;f=builtin-rm.c;h=4d56a1f07065e6e8ebaa95fdfe843cffb6283af3;hp=e7793a20f5c38ff31d4a74b7e1cec50b9a9f252e;hb=162f41292167a800432fc6bbacfcd9f93a90b0c8;hpb=cd01d9445de1bbca8952c7ee16941f5fa10747f5

diff --git a/builtin-rm.c b/builtin-rm.c
index e7793a20..4d56a1f0 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");
 
@@ -83,15 +83,15 @@ int cmd_rm(int argc, const char **argv, char **envp)
 		}
 		die(builtin_rm_usage);
 	}
-	pathspec = get_pathspec(prefix, argv + i);
+	if (argc <= i)
+		usage(builtin_rm_usage);
 
+	pathspec = get_pathspec(prefix, argv + i);
 	seen = NULL;
-	if (pathspec) {
-		for (i = 0; pathspec[i] ; i++)
-			/* nothing */;
-		seen = xmalloc(i);
-		memset(seen, 0, i);
-	}
+	for (i = 0; pathspec[i] ; i++)
+		/* nothing */;
+	seen = xmalloc(i);
+	memset(seen, 0, i);
 
 	for (i = 0; i < active_nr; i++) {
 		struct cache_entry *ce = active_cache[i];
@@ -121,6 +121,9 @@ int cmd_rm(int argc, const char **argv, char **envp)
 		cache_tree_invalidate_path(active_cache_tree, path);
 	}
 
+	if (show_only)
+		return 0;
+
 	/*
 	 * Then, if we used "-f", remove the filenames from the
 	 * workspace. If we fail to remove the first one, we
@@ -144,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_index_file(&cache_file))
+		    commit_lock_file(&lock_file))
 			die("Unable to write new index file");
 	}