From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Tue, 8 Mar 2011 03:29:58 +0000 (+0000)
Subject: scm: git: convert path encoding in "git log" (#5251).
X-Git-Tag: 1.2.0~806
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=08ee6a39325f85daffc03d7dd02bf20341f2680c;p=redmine.git

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
---

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)