/jruby

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Require real path" #5117

Merged
merged 1 commit into from Mar 27, 2018

Conversation

Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
  JRuby 9.2.0.0
1 participant
@headius
@headius
Member

headius commented Mar 27, 2018

Reverts #5109

I believe this broke some tests that depend on it not traversing symlinks, such as here: https://travis-ci.org/jruby/jruby/jobs/359034412

@ChrisBr I am about to merge 2.5 to master, so if you want to take another crack at this, base your PR on master.
@headius
Revert "Require real path"
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
8aef4af

@headius headius added this to the JRuby 9.2.0.0 milestone Mar 27, 2018

@headius headius merged commit 0cdd2f9 into ruby-2.5 Mar 27, 2018
1 check was pending

1 check was pending

continuous-integration/travis-ci/push The Travis CI build is in progress
Details

@headius headius deleted the revert-5109-bug/fix_require_symlink branch Mar 27, 2018

ChrisBr added a commit to ChrisBr/jruby that referenced this pull request Mar 27, 2018

@ChrisBr
Require real path 
expand load paths to real paths to get rid of duplicate loading from
symbolic-linked directories. [Feature #10222]
ruby/ruby@b6d3927

This fixes

test/mri/ruby/test_require.rb#test_symlink_load_path

Deletes obsolete spec/regression/GH-1940_symlink_load_path_should_not_expand_in_FILE_spec.rb

jruby#5109 jruby#5117
Verified
This commit was signed with a verified signature.
@ChrisBr ChrisBr Christian Bruckmayer
GPG key ID: 168295FC108C44E5 Learn about signing commits
1e1c11b

@ChrisBr ChrisBr referenced this pull request Mar 27, 2018

Merged

Require real path #5121

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment