Merge branch 'tr/packed-object-info-wo-recursion'

diff --git a/builtin/rm.c b/builtin/rm.c
index dabfcf689068804f2b352d200b35770b467a27e8..7b91d52f39004dbfcc9b0dc5b8aadf3df5c6d320 100644 (file)
--- 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;