Skip to content

Commit d5b0ec0

Browse files
tbrandperlun
authored andcommitted
process_full_diff: Don't reencode diffs which are already UTF-8 (#369)
1 parent 4435e08 commit d5b0ec0

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

lib/git/diff.rb

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -127,10 +127,11 @@ def process_full_diff
127127
}
128128
final = {}
129129
current_file = nil
130-
full_diff_utf8_encoded = @full_diff.encode("UTF-8", "binary", {
131-
:invalid => :replace,
132-
:undef => :replace
133-
})
130+
if @full_diff.encoding.name != "UTF-8"
131+
full_diff_utf8_encoded = @full_diff.encode("UTF-8", "binary", { :invalid => :replace, :undef => :replace })
132+
else
133+
full_diff_utf8_encoded = @full_diff
134+
end
134135
full_diff_utf8_encoded.split("\n").each do |line|
135136
if m = /^diff --git a\/(.*?) b\/(.*?)/.match(line)
136137
current_file = m[1]

0 commit comments

Comments
 (0)