scm: git: add new two latin1 branches to test repository (#16881)

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

diff --git a/lib/redmine/scm/adapters/git_adapter.rb b/lib/redmine/scm/adapters/git_adapter.rb
index face00a5d202c336071dbc7248ee05ee270b9e87..7129864c40c3b7f31d11dfa0be2a592b6f645678 100644 (file)
--- a/lib/redmine/scm/adapters/git_adapter.rb
+++ b/lib/redmine/scm/adapters/git_adapter.rb
@@ -84,7 +84,7 @@ module Redmine
           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(scm_iconv('UTF-8', @path_encoding, branch_rev[2]))
               bran.revision =  branch_rev[3]
               bran.scmid    =  branch_rev[3]
               bran.is_default = ( branch_rev[1] == '*' )

diff --git a/test/fixtures/repositories/git_repository.tar.gz b/test/fixtures/repositories/git_repository.tar.gz
index 9c0cd2371a146ece2261aa1918121a7a706ceec3..ce1671caa015bfddc85c11510f451c0679142a93 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 589a528070303a81613b2a6aa4bdfad377dcc05f..98dbbe35cd6b7c3f96a9c7db2cccd2c8e6976a57 100644 (file)
--- a/test/unit/lib/redmine/scm/adapters/git_adapter_test.rb
+++ b/test/unit/lib/redmine/scm/adapters/git_adapter_test.rb
@@ -75,23 +75,33 @@ class GitAdapterTest < ActiveSupport::TestCase
       @adapter.branches.each do |b|
         brs << b
       end
-      assert_equal 6, brs.length
+      assert_equal 8, brs.length
       br_issue_8857 = brs[0]
       assert_equal 'issue-8857', br_issue_8857.to_s 
       assert_equal '2a682156a3b6e77a8bf9cd4590e8db757f3c6c78', br_issue_8857.revision
       assert_equal br_issue_8857.scmid, br_issue_8857.revision
       assert_equal false, br_issue_8857.is_default
-      br_latin_1_path = brs[1]
+      br_latin_1_branch1 = brs[1]
+      assert_equal "latin-1-branch-#{@char_1}-01", br_latin_1_branch1.to_s 
+      assert_equal '4fc55c43bf3d3dc2efb66145365ddc17639ce81e', br_latin_1_branch1.revision
+      assert_equal br_latin_1_branch1.scmid, br_latin_1_branch1.revision
+      assert_equal false, br_latin_1_branch1.is_default
+      br_latin_1_branch2 = brs[2]
+      assert_equal "latin-1-branch-#{@char_1}-02", br_latin_1_branch2.to_s 
+      assert_equal '1ca7f5ed374f3cb31a93ae5215c2e25cc6ec5127', br_latin_1_branch2.revision
+      assert_equal br_latin_1_branch2.scmid, br_latin_1_branch2.revision
+      assert_equal false, br_latin_1_branch2.is_default
+      br_latin_1_path = brs[3]
       assert_equal 'latin-1-path-encoding', br_latin_1_path.to_s 
       assert_equal '1ca7f5ed374f3cb31a93ae5215c2e25cc6ec5127', br_latin_1_path.revision
       assert_equal br_latin_1_path.scmid, br_latin_1_path.revision
       assert_equal false, br_latin_1_path.is_default
-      br_master = brs[2]
+      br_master = brs[4]
       assert_equal 'master', br_master.to_s
       assert_equal '83ca5fd546063a3c7dc2e568ba3355661a9e2b2c', br_master.revision
       assert_equal br_master.scmid, br_master.revision
       assert_equal false, br_master.is_default
-      br_master_20120212 = brs[3]
+      br_master_20120212 = brs[5]
       assert_equal 'master-20120212', br_master_20120212.to_s
       assert_equal '83ca5fd546063a3c7dc2e568ba3355661a9e2b2c', br_master_20120212.revision
       assert_equal br_master_20120212.scmid, br_master_20120212.revision

diff --git a/test/unit/repository_git_test.rb b/test/unit/repository_git_test.rb
index 6b228dc36bda5b80d68c30f0fb8401f8a7baecb0..1c2c55064ed97e2cde3c13019280024c62e369d4 100644 (file)
--- a/test/unit/repository_git_test.rb
+++ b/test/unit/repository_git_test.rb
@@ -28,7 +28,7 @@ class RepositoryGitTest < ActiveSupport::TestCase
   REPOSITORY_PATH.gsub!(/\//, "\\") if Redmine::Platform.mswin?
 
   NUM_REV = 28
-  NUM_HEAD = 6
+  NUM_HEAD = 8
 
   ## Git, Mercurial and CVS path encodings are binary.
   ## Subversion supports URL encoding for path.