Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e92030e480f7
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: eb94ae08af3f
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Aug 18, 2015

  1. Apply fix for #3092 to fix #3169.

    @headius
    headius committed Aug 18, 2015
    Copy the full SHA
    e88a594 View commit details

  2. Apply File.realdirpath fix from #3092.

    @headius
    headius committed Aug 18, 2015
    Copy the full SHA
    eb94ae0 View commit details
Showing with 2 additions and 2 deletions.
  1. +1 −1 core/src/main/java/org/jruby/RubyFile.java
  2. +1 −1 core/src/main/ruby/jruby/kernel19/kernel.rb
2 changes: 1 addition & 1 deletion core/src/main/java/org/jruby/RubyFile.java
View file
Original file line number Diff line number Diff line change
@@ -829,7 +829,7 @@ public static IRubyObject absolute_path(ThreadContext context, IRubyObject recv,

@JRubyMethod(name = {"realdirpath"}, required = 1, optional = 1, meta = true, compat = RUBY1_9)
public static IRubyObject realdirpath(ThreadContext context, IRubyObject recv, IRubyObject[] args) {
return expandPathInternal(context, recv, args, false, false);
return expandPathInternal(context, recv, args, false, true);
}

@JRubyMethod(name = {"realpath"}, required = 1, optional = 1, meta = true, compat = RUBY1_9)
2 changes: 1 addition & 1 deletion core/src/main/ruby/jruby/kernel19/kernel.rb
View file
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ def require_relative(relative_arg)
file = $` # just the filename
raise LoadError, "cannot infer basepath" if /\A\((.*)\)/ =~ file # eval etc.

absolute_feature = File.expand_path(relative_arg, File.dirname(file))
absolute_feature = File.expand_path(relative_arg, File.dirname(File.realpath(file)))

require absolute_feature
end