Merged r12143 from trunk to 2.3-stable (#14931)

scm: git: use "--encoding=UTF-8" for blame. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@12159 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-09-19 03:25:38 +00:00
parent 2b53422d1d
commit 79f90dfba5
2 changed files with 14 additions and 1 deletions
@@ -333,7 +333,7 @@ module Redmine

        def annotate(path, identifier=nil)
          identifier = 'HEAD' if identifier.blank?
-          cmd_args = %w|blame|
+          cmd_args = %w|blame --encoding=UTF-8|
          cmd_args << "-p" << identifier << "--" <<  scm_iconv(@path_encoding, 'UTF-8', path)
          blame = Annotate.new
          content = nil