diff options
| author | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2011-03-08 03:29:58 +0000 |
|---|---|---|
| committer | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2011-03-08 03:29:58 +0000 |
| commit | 08ee6a39325f85daffc03d7dd02bf20341f2680c (patch) | |
| tree | 55b0bfda59c7db4dc8ba632cf63fe7fd562024a2 /lib/redmine/scm | |
| parent | 3c0fdd4938a204bdb3c759a5ebe34b477992f72b (diff) | |
| download | redmine-08ee6a39325f85daffc03d7dd02bf20341f2680c.tar.gz redmine-08ee6a39325f85daffc03d7dd02bf20341f2680c.zip | |
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
Diffstat (limited to 'lib/redmine/scm')
| -rw-r--r-- | lib/redmine/scm/adapters/git_adapter.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/redmine/scm/adapters/git_adapter.rb b/lib/redmine/scm/adapters/git_adapter.rb index 25637dbd8..4f22e597b 100644 --- a/lib/redmine/scm/adapters/git_adapter.rb +++ b/lib/redmine/scm/adapters/git_adapter.rb @@ -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) |