kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

scm: git: fix unit adapter test fails in Ruby 1.9 Linux latin-1 locale (#5251). 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5066 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2011-03-08 13:22:53 +00:00
parent 4f5f98220e
commit f36f5d0fee
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/redmine/scm/adapters/git_adapter.rb
View File

@ -113,15 +113,15 @@ module Redmine
cmd_args << "#{identifier}:#{p}" if identifier cmd_args << "#{identifier}:#{p}" if identifier
scm_cmd(*cmd_args) do |io| scm_cmd(*cmd_args) do |io|
io.each_line do |line| io.each_line do |line|
if line.respond_to?(:force_encoding)
line.force_encoding('ASCII-8BIT')
end
e = line.chomp.to_s e = line.chomp.to_s
if e =~ /^\d+\s+(\w+)\s+([0-9a-f]{40})\s+([0-9-]+)\t(.+)$/ if e =~ /^\d+\s+(\w+)\s+([0-9a-f]{40})\s+([0-9-]+)\t(.+)$/
type = $1 type = $1
sha = $2 sha = $2
size = $3 size = $3
name = $4 name = $4
if name.respond_to?(:force_encoding)
name.force_encoding(@path_encoding)
end
full_path = p.empty? ? name : "#{p}/#{name}" full_path = p.empty? ? name : "#{p}/#{name}"
n = scm_iconv('UTF-8', @path_encoding, name) n = scm_iconv('UTF-8', @path_encoding, name)
full_p = scm_iconv('UTF-8', @path_encoding, full_path) full_p = scm_iconv('UTF-8', @path_encoding, full_path)