Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Using the Ruby 1.8 hash rocket syntax
  • Loading branch information
jatinganhotra committed Jan 11, 2015
commit c05431c60e57880bb627a13fc1483b6f61d426ab
2 changes: 1 addition & 1 deletion lib/git/diff.rb
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ def cache_stats
def process_full_diff
final = {}
current_file = nil
full_diff_utf8_encoded = @full_diff.encode("UTF-8", "binary", invalid: :replace, undef: :replace)
full_diff_utf8_encoded = @full_diff.encode("UTF-8", "binary", :invalid => "replace", :undef => "replace")
full_diff_utf8_encoded.split("\n").each do |line|
if m = /diff --git a\/(.*?) b\/(.*?)/.match(line)
current_file = m[1]
Expand Down
2 changes: 1 addition & 1 deletion lib/git/lib.rb
Original file line number Diff line number Diff line change
Expand Up @@ -731,7 +731,7 @@ def meets_required_version?

def command_lines(cmd, opts = [], chdir = true, redirect = '')
cmd_op = command(cmd, opts, chdir)
op = cmd_op.encode("UTF-8", "binary", invalid: :replace, undef: :replace)
op = cmd_op.encode("UTF-8", "binary", :invalid => "replace", :undef => "replace")
op.split("\n")
end

Expand Down