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: 607e98c6dd2e
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b51b479cfbf8
Choose a head ref
  • 4 commits
  • 4 files changed
  • 1 contributor

Commits on Nov 8, 2014

  1. Copy the full SHA
    f093698 View commit details

Commits on Nov 9, 2014

  1. Copy the full SHA
    b9b6031 View commit details
  2. Copy the full SHA
    d7942fb View commit details
  3. Copy the full SHA
    b51b479 View commit details
Showing with 5 additions and 1 deletion.
  1. +1 −1 core/src/main/java/org/jruby/RubyString.java
  2. +2 −0 test/mri/excludes/TestException.rb
  3. +1 −0 test/mri/excludes/TestString.rb
  4. +1 −0 test/mri/excludes/TestZlib.rb
2 changes: 1 addition & 1 deletion core/src/main/java/org/jruby/RubyString.java
Original file line number Diff line number Diff line change
@@ -904,8 +904,8 @@ private RubyString makeShared19(Ruby runtime, RubyClass meta, ByteList value, in
if (shareLevel == SHARE_LEVEL_NONE) shareLevel = SHARE_LEVEL_BUFFER;
shared = new RubyString(runtime, meta, value.makeShared(index, len));
shared.shareLevel = SHARE_LEVEL_BUFFER;
shared.copyCodeRangeForSubstr(this, enc); // no need to assign encoding, same bytelist shared
}
shared.copyCodeRangeForSubstr(this, enc); // no need to assign encoding, same bytelist shared
shared.infectBy(this);
return shared;
}
2 changes: 2 additions & 0 deletions test/mri/excludes/TestException.rb
Original file line number Diff line number Diff line change
@@ -11,3 +11,5 @@
exclude :test_thread_signal_location, "needs investigation"
exclude :test_to_s_taintness_propagation, "needs investigation"
exclude :test_too_many_args_in_eval, "needs investigation"
exclude :test_type_error_message_encoding, "minor error message differences"
exclude :test_unknown_option, "options passed to raise other than :cause must pass through to exception"
1 change: 1 addition & 0 deletions test/mri/excludes/TestString.rb
Original file line number Diff line number Diff line change
@@ -13,6 +13,7 @@
exclude :test_hash_random, "needs investigation"
exclude :test_lines, "needs investigation"
exclude :test_partition, "needs investigation"
exclude :test_regexp_match_subclass, "String subclass with overridden =~ should see obj =~ dispatch (#2157)"
exclude :test_rpartition, "needs investigation"
exclude :test_rstrip, "needs investigation"
exclude :test_split, "needs investigation"
1 change: 1 addition & 0 deletions test/mri/excludes/TestZlib.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
exclude :test_deflate_stream, "stream support is new in 2.2 (#2128)"