--- lib/redmine/scm/adapters/git_adapter.rb.org Sat Nov 23 17:41:44 2013 +++ lib/redmine/scm/adapters/git_adapter.rb Wed May 14 10:55:15 2014 @@ -82,11 +82,11 @@ return @branches if @branches @branches = [] cmd_args = %w|branch --no-color --verbose --no-abbrev| git_cmd(cmd_args) do |io| io.each_line do |line| - branch_rev = line.match('\s*(\*?)\s*(.*?)\s*([0-9a-f]{40}).*$') + branch_rev = line.force_encoding('UTF-8').match('\s*(\*?)\s*(.*?)\s*([0-9a-f]{40}).*$') bran = GitBranch.new(branch_rev[2]) bran.revision = branch_rev[3] bran.scmid = branch_rev[3] bran.is_default = ( branch_rev[1] == '*' ) @branches << bran @@ -99,11 +99,11 @@ def tags return @tags if @tags cmd_args = %w|tag| git_cmd(cmd_args) do |io| - @tags = io.readlines.sort!.map{|t| t.strip} + @tags = io.readlines.sort!.map{|t| t.strip.force_encoding('UTF-8')} end rescue ScmCommandAborted nil end