Fix an issue caused by detecting the encoding when first data ia empty #17

Merged
merged 2 commits into from Apr 11, 2013

Projects

None yet

2 participants

@JonRowe

If the first data passed to Diff::LCS::Hunk is empty then we get an error due to the encoding detection introduced in 1.2.2.
This attempts to use the old data as an encoding source, falls back to the new data as an encoding source and then finally to a string literal.

@JonRowe JonRowe referenced this pull request in rspec/rspec-expectations Apr 11, 2013
Merged

Upgrade to diff-lcs 1.2.2 #239

@halostatue
Owner

I'll merge this as soon as I file a bug with Rubinius for the failed build in 1.9 mode—I need to be able to make a test case for them to see the problem in a somewhat better way. I'm treating it similar to the MacRuby issue; everyone else gets it right, why doesn't rbx?

That should be by the afternoon, and I'll do a release this evening.

@halostatue halostatue merged commit 68e1a15 into halostatue:master Apr 11, 2013

1 check failed

Details default The Travis build failed
@JonRowe

Hey thanks! Could you ping me (via mention or whatever) when you've rolled a release? We're awaiting it over on RSpec :)

@halostatue
Owner

@JonRowe the release is complete.

@JonRowe

Thanks @halostatue! Appreciate it :)

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