git-rm: do not fail on already removed file.
Often the user would do "/bin/rm foo" before telling git, but then want to tell git about it. "git rm foo" however would fail because it cannot unlink(2) foo. Treat ENOENT error return from unlink(2) as if a successful removal happened. Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
parent
3b97fee23d
commit
646ac22bdf
@ -32,6 +32,10 @@ static int remove_file(const char *name)
|
||||
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 {
|
||||
@ -204,7 +208,7 @@ int cmd_rm(int argc, const char **argv, const char *prefix)
|
||||
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:
|
||||
|
Loading…
Reference in New Issue
Block a user