diff --git a/builtin-rm.c b/builtin-rm.c
index 5b078c41943c9ce0ff1983896e8ad6ae38705f60..00dbe399609051647f393e0c543a862a0ba432c8 100644 (file)
--- a/builtin-rm.c
+++ b/builtin-rm.c
#include "tree-walk.h"
static const char builtin_rm_usage[] =
-"git-rm [-n] [-f] [--cached] <filepattern>...";
+"git-rm [-f] [-n] [-r] [--cached] [--] <file>...";
static struct {
int nr, alloc;
char *slash;
ret = unlink(name);
+ if (ret && errno == ENOENT)
+ /* The user has removed it from the filesystem by hand */
+ ret = errno = 0;
+
if (!ret && (slash = strrchr(name, '/'))) {
char *n = xstrdup(name);
do {
return 0;
/*
- * Then, unless we used "--cache", remove the filenames from
+ * Then, unless we used "--cached", remove the filenames from
* the workspace. If we fail to remove the first one, we
* abort the "git rm" (but once we've successfully removed
* any file at all, we'll go ahead and commit to it all: