From 7ac6c967e49d1e3ad46be20aca98e8f1df2c2d5b Mon Sep 17 00:00:00 2001
From: Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
Date: Mon, 22 Jun 2020 18:15:21 +0900
Subject: Revert d231b8f95b35d8a344cec4f62d7bbdf360a70e1c and add debug print

---
 lib/fileutils.rb | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'lib/fileutils.rb')

diff --git a/lib/fileutils.rb b/lib/fileutils.rb
index 371a348159..438f3210f7 100644
--- a/lib/fileutils.rb
+++ b/lib/fileutils.rb
@@ -1287,11 +1287,7 @@ module FileUtils
 
     def entries
       opts = {}
-      if fu_windows? && ::Encoding.compatible?(::Encoding::UTF_8, path.encoding)
-        opts[:encoding] = ::Encoding::UTF_8
-      else
-        opts[:encoding] = path.encoding
-      end
+      opts[:encoding] = fu_windows? ? ::Encoding::UTF_8 : path.encoding
 
       files = if Dir.respond_to?(:children)
         Dir.children(path, **opts)
-- 
cgit v1.2.3