From e45000cf9875084ec52838bc3c89eb23b2de6ad3 Mon Sep 17 00:00:00 2001 From: Kovalev Vladimir Date: Wed, 23 Mar 2016 11:38:31 +0300 Subject: [PATCH] force UTF-8 encoding for tags and branches --- lib/redmine/scm/adapters/xitolite_adapter.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/redmine/scm/adapters/xitolite_adapter.rb b/lib/redmine/scm/adapters/xitolite_adapter.rb index 91e60e26f..b5e6e4dba 100644 --- a/lib/redmine/scm/adapters/xitolite_adapter.rb +++ b/lib/redmine/scm/adapters/xitolite_adapter.rb @@ -85,7 +85,7 @@ def branches git_cmd(cmd_args) do |io| io.each_line do |line| branch_rev = line.match('\s*(\*?)\s*(.*?)\s*([0-9a-f]{40}).*$') - bran = GitBranch.new(branch_rev[2]) + bran = GitBranch.new(branch_rev[2].to_s.force_encoding(Encoding::UTF_8)) bran.revision = branch_rev[3] bran.scmid = branch_rev[3] bran.is_default = (branch_rev[1] == '*') @@ -104,7 +104,7 @@ def tags @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(Encoding::UTF_8) } end @tags rescue ScmCommandAborted => e