undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-rm: honor -n flag.

Browse Source 
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>
This commit is contained in:
Junio C Hamano 2006-06-08 21:11:25 -07:00
parent 2048bb00ee
commit 7612a1efdb
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
builtin-rm.c
View File

@ -83,15 +83,15 @@ int cmd_rm(int argc, const char **argv, char **envp)
} }
die(builtin_rm_usage); 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; seen = NULL;
if (pathspec) { for (i = 0; pathspec[i] ; i++)
for (i = 0; pathspec[i] ; i++) /* nothing */;
/* nothing */; seen = xmalloc(i);
seen = xmalloc(i); memset(seen, 0, i);
memset(seen, 0, i);
}
for (i = 0; i < active_nr; i++) { for (i = 0; i < active_nr; i++) {
struct cache_entry *ce = active_cache[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); cache_tree_invalidate_path(active_cache_tree, path);
} }
if (show_only)
return 0;
/* /*
* Then, if we used "-f", remove the filenames from the * Then, if we used "-f", remove the filenames from the
* workspace. If we fail to remove the first one, we * workspace. If we fail to remove the first one, we