scm: git: add new one latin1 tag to test repository (#16881)

git-svn-id: http://svn.redmine.org/redmine/trunk@18040 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/lib/redmine/scm/adapters/git_adapter.rb b/lib/redmine/scm/adapters/git_adapter.rb
index 7129864c40c3b7f31d11dfa0be2a592b6f645678..8a1d36c7eb261ad3b6029db97a117daa860c982a 100644 (file)
--- 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
index ce1671caa015bfddc85c11510f451c0679142a93..0ea93071f1518062464dbaebc4d7f94f09557e99 100644 (file)
Binary files a/test/fixtures/repositories/git_repository.tar.gz and b/test/fixtures/repositories/git_repository.tar.gz differ

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 98dbbe35cd6b7c3f96a9c7db2cccd2c8e6976a57..0edd32152581ef6fdc075b764c8065367ed2527f 100644 (file)
--- 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