Skip to content

Commit eee29b1

Browse files
authored
Merge pull request #583 from kovalevvv/devel
force UTF-8 encoding for tags and branches
2 parents da2fe12 + e45000c commit eee29b1

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Diff for: lib/redmine/scm/adapters/xitolite_adapter.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ def branches
8585
git_cmd(cmd_args) do |io|
8686
io.each_line do |line|
8787
branch_rev = line.match('\s*(\*?)\s*(.*?)\s*([0-9a-f]{40}).*$')
88-
bran = GitBranch.new(branch_rev[2])
88+
bran = GitBranch.new(branch_rev[2].to_s.force_encoding(Encoding::UTF_8))
8989
bran.revision = branch_rev[3]
9090
bran.scmid = branch_rev[3]
9191
bran.is_default = (branch_rev[1] == '*')
@@ -104,7 +104,7 @@ def tags
104104
@tags = []
105105
cmd_args = %w|tag|
106106
git_cmd(cmd_args) do |io|
107-
@tags = io.readlines.sort!.map { |t| t.strip }
107+
@tags = io.readlines.sort!.map { |t| t.strip.force_encoding(Encoding::UTF_8) }
108108
end
109109
@tags
110110
rescue ScmCommandAborted => e

0 commit comments

Comments
 (0)