diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-06-08 21:11:25 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-06-08 21:11:25 -0700 |
| commit | 7612a1efdb0c0806b43db10ce784707aae874340 (patch) | |
| tree | 9e664ed75be002a4457db4a5843820149fa860df | |
| parent | git-clone: fix duplicated "master" in $GIT_DIR/remotes/origin (diff) | |
| download | tgif-7612a1efdb0c0806b43db10ce784707aae874340.tar.xz | |
git-rm: honor -n flag.
Even when invoked with -n flag, git-rm removed the matching
paths anyway. Also includes the missing check spotted by
SungHyun Nam, which caused it to segfault. Now we refuse to run
without any paths.
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rw-r--r-- | builtin-rm.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/builtin-rm.c b/builtin-rm.c index ef2f8b5d09..4d56a1f070 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 |