summaryrefslogtreecommitdiffstats
path: root/lib/redmine/scm
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2013-09-18 06:16:55 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2013-09-18 06:16:55 +0000
commit900247700663c85e6ed1e352fa5b0a42367b6389 (patch)
tree7396a8ddfd935451bbf3e96d87abbe16e6a4d733 /lib/redmine/scm
parentda87e4b1ef39e03a59a00e3cf8de2b0ad351f5c8 (diff)
downloadredmine-900247700663c85e6ed1e352fa5b0a42367b6389.tar.gz
redmine-900247700663c85e6ed1e352fa5b0a42367b6389.zip
scm: git: use "--encoding=UTF-8" for blame (#14931)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12143 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib/redmine/scm')
-rw-r--r--lib/redmine/scm/adapters/git_adapter.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/redmine/scm/adapters/git_adapter.rb b/lib/redmine/scm/adapters/git_adapter.rb
index 1876190d9..3c9758a2e 100644
--- a/lib/redmine/scm/adapters/git_adapter.rb
+++ b/lib/redmine/scm/adapters/git_adapter.rb
@@ -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