diff options
| -rw-r--r-- | lib/redmine/scm/adapters/git_adapter.rb | 2 | ||||
| -rw-r--r-- | test/fixtures/repositories/git_repository.tar.gz | bin | 21068 -> 21103 bytes | |||
| -rw-r--r-- | test/unit/lib/redmine/scm/adapters/git_adapter_test.rb | 1 |
3 files changed, 2 insertions, 1 deletions
diff --git a/lib/redmine/scm/adapters/git_adapter.rb b/lib/redmine/scm/adapters/git_adapter.rb index 7129864c4..8a1d36c7e 100644 --- a/lib/redmine/scm/adapters/git_adapter.rb +++ b/lib/redmine/scm/adapters/git_adapter.rb @@ -101,7 +101,7 @@ module Redmine @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| scm_iconv('UTF-8', @path_encoding, t.strip)} end @tags rescue ScmCommandAborted diff --git a/test/fixtures/repositories/git_repository.tar.gz b/test/fixtures/repositories/git_repository.tar.gz Binary files differindex ce1671caa..0ea93071f 100644 --- a/test/fixtures/repositories/git_repository.tar.gz +++ b/test/fixtures/repositories/git_repository.tar.gz diff --git a/test/unit/lib/redmine/scm/adapters/git_adapter_test.rb b/test/unit/lib/redmine/scm/adapters/git_adapter_test.rb index 98dbbe35c..0edd32152 100644 --- a/test/unit/lib/redmine/scm/adapters/git_adapter_test.rb +++ b/test/unit/lib/redmine/scm/adapters/git_adapter_test.rb @@ -126,6 +126,7 @@ class GitAdapterTest < ActiveSupport::TestCase assert_equal [ "tag00.lightweight", "tag01.annotated", + "tag02.lightweight.#{@char_1}.01" ], @adapter.tags end |