X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=builtin-rm.c;fp=builtin-rm.c;h=4d56a1f07065e6e8ebaa95fdfe843cffb6283af3;hb=55becd7b5fdbd93a2928a659a670d004d30d7c37;hp=ef2f8b5d099555c259a39985d8e765cf378e4431;hpb=a95e01885a6569788de91939ef0872ada51b03e2;p=git.git

diff --git a/builtin-rm.c b/builtin-rm.c
index ef2f8b5d..4d56a1f0 100644
--- a/builtin-rm.c
+++ b/builtin-rm.c
@@ -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