aboutsummaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-04-07 14:33:14 -0700
committerJunio C Hamano <gitster@pobox.com>2013-04-07 14:33:14 -0700
commit0f3d66c6dc0c6915888fbf928de0ae22739abc70 (patch)
tree6d9ef01cc818a63d7001c06cc305c4a326787926 /builtin
parente65cdde45444a9cb297d4ff8f18d1eb5529cdce4 (diff)
parent03415ca8db28e67ca04e04126b42f38a90c825de (diff)
downloadgit-0f3d66c6dc0c6915888fbf928de0ae22739abc70.tar.gz
git-0f3d66c6dc0c6915888fbf928de0ae22739abc70.tar.xz
Merge branch 'jk/rm-removed-paths'
A handful of test cases and a corner case bugfix for "git rm". * jk/rm-removed-paths: t3600: document failure of rm across symbolic links t3600: test behavior of reverse-d/f conflict rm: do not complain about d/f conflicts during deletion
Diffstat (limited to 'builtin')
-rw-r--r--builtin/rm.c2
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;