Project

General

Profile

Patch #30827 » git_adapter.rb.patch

v2 - Pavel Rosický, 2019-02-18 18:22

View differences:

git_adapter.rb (working copy)
82 82
          git_cmd(cmd_args) do |io|
83 83
            io.each_line do |line|
84 84
              branch_rev = line.match('\s*(\*?)\s*(.*?)\s*([0-9a-f]{40}).*$')
85
              bran = GitBranch.new(branch_rev[2])
86
              bran.revision =  branch_rev[3]
87
              bran.scmid    =  branch_rev[3]
85
              bran_name = Redmine::CodesetUtil.replace_invalid_utf8(branch_rev[2])
86
              bran_revision = Redmine::CodesetUtil.replace_invalid_utf8(branch_rev[3])
87
              bran = GitBranch.new(bran_name)
88
              bran.revision =  bran_revision
89
              bran.scmid    =  bran_revision
88 90
              bran.is_default = ( branch_rev[1] == '*' )
89 91
              @branches << bran
90 92
            end
......
99 101
          @tags = []
100 102
          cmd_args = %w|tag|
101 103
          git_cmd(cmd_args) do |io|
102
            @tags = io.readlines.sort!.map{|t| t.strip}
104
            @tags = io.readlines.sort!.map{|t| Redmine::CodesetUtil.replace_invalid_utf8(t.strip) }
103 105
          end
104 106
          @tags
105 107
        rescue ScmCommandAborted
(2-2/4)