summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorKazuhiro NISHIYAMA <[email protected]>2020-06-22 18:34:24 +0900
committerKazuhiro NISHIYAMA <[email protected]>2020-06-22 18:34:24 +0900
commit6adbdb56edcf62c11229e1c9c6f75656700f1c5f ()
tree5272b8bbee68b7fbd12d9021554941a34ce518f5 /lib
parent3a1e63e54064496755e9e306f10c72fafc5bd162 (diff)
Fix Encoding::CompatibilityError in `FileUtils::Entry_#join`
-rw-r--r--lib/fileutils.rb10
1 files changed, 9 insertions, 1 deletions
@@ -1557,7 +1557,15 @@ module FileUtils
def join(dir, base)
return File.path(dir) if not base or base == '.'
return File.path(base) if not dir or dir == '.'
- File.join(dir, base)
end
if File::ALT_SEPARATOR