diff options
| author | Jeff King <peff@peff.net> | 2013-04-04 15:03:35 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-04 12:28:47 -0700 |
| commit | 9a6728d4d14a08791861a63b7567ee0b50e59f70 (patch) | |
| tree | 246e029fbdefd279e1b763c9e22360a54a07ee04 /builtin | |
| parent | 9b924eee98332225f63c36c5d9673c47e0a8b769 (diff) | |
| download | git-9a6728d4d14a08791861a63b7567ee0b50e59f70.tar.gz git-9a6728d4d14a08791861a63b7567ee0b50e59f70.tar.xz | |
rm: do not complain about d/f conflicts during deletion
If we used to have an index entry "d/f", but "d" has been
replaced by a non-directory entry, the user may still want
to run "git rm" to delete the stale index entry. They could
use "git rm --cached" to just touch the index, but "git rm"
should also work: we explicitly try to handle the case that
the file has already been removed from the working tree.
However, because unlinking "d/f" in this case will not yield
ENOENT, but rather ENOTDIR, we do not notice that the file
is already gone. Instead, we report it as an error.
The simple solution is to treat ENOTDIR in this case exactly
like ENOENT; all we want to know is whether the file is
already gone, and if a leading path is no longer a
directory, then by definition the sub-path is gone.
Reported-by: jpinheiro <7jpinheiro@gmail.com>
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/rm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/rm.c b/builtin/rm.c index dabfcf689..7b91d52f3 100644 --- a/builtin/rm.c +++ b/builtin/rm.c @@ -110,7 +110,7 @@ static int check_local_mod(unsigned char *head, int index_only) ce = active_cache[pos]; if (lstat(ce->name, &st) < 0) { - if (errno != ENOENT) + if (errno != ENOENT && errno != ENOTDIR) warning("'%s': %s", ce->name, strerror(errno)); /* It already vanished from the working tree */ continue; |