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
base: c885d6f193e4
Choose a base ref
...
head repository: jruby/jruby
compare: fad37ea767ae
Choose a head ref
  • 4 commits
  • 2 files changed
  • 1 contributor

Commits on Mar 2, 2015

  1. Add spec for GH-1270. 

    Note that there's an unfixable (in 1.7) edge case described and
disabled in the spec. I will apply the unmodified case to master,
which handles it ok.
    @headius
    headius committed Mar 2, 2015
    Copy the full SHA
    ab2d782 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/jruby-1_7'

    @headius
    headius committed Mar 2, 2015
    Copy the full SHA
    25499af View commit details
    Browse the repository at this point in the history

  3. Restore original one-liner in spec for #1270.

    @headius
    headius committed Mar 2, 2015
    Copy the full SHA
    c4cdb07 View commit details
    Browse the repository at this point in the history

  4. Only consider break jumps actually originating from this proc. 

    Fixes #1270 on master.
    @headius
    headius committed Mar 2, 2015
    Copy the full SHA
    fad37ea View commit details
    Browse the repository at this point in the history