Skip to content

O
OHR Support
Commit e439ae3c authored by Toshi MARUYAMA's avatar Toshi MARUYAMA Committed by Eric Davis
Browse files
Options

scm: git: convert path encoding in "git log" (#5251). 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5036 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent 01ca8f6b
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
lib/redmine/scm/adapters/git_adapter.rb
View file @ e439ae3c
......@@ -213,13 +213,15 @@ module Redmine
parsing_descr = 2
fileaction = $1
filepath = $2
files << {:action => fileaction, :path => filepath}
p = scm_iconv('UTF-8', @path_encoding, filepath)
files << {:action => fileaction, :path => p}
elsif (parsing_descr == 1 || parsing_descr == 2) \
&& line =~ /^:\d+\s+\d+\s+[0-9a-f.]+\s+[0-9a-f.]+\s+(\w)\d+\s+(\S+)\t(.+)$/
parsing_descr = 2
fileaction = $1
filepath = $3
files << {:action => fileaction, :path => filepath}
p = scm_iconv('UTF-8', @path_encoding, filepath)
files << {:action => fileaction, :path => p}
elsif (parsing_descr == 1) && line.chomp.to_s == ""
parsing_descr = 2
elsif (parsing_descr == 1)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment