Browse Source

Garbage lines in the output of 'git branch' break git adapter (#31120).

Contributed by Chad Petersen.


git-svn-id: http://svn.redmine.org/redmine/trunk@18046 e93f8b46-1217-0410-a6f0-8f06a7374b81
tags/4.1.0
Go MAEDA 5 years ago
parent
commit
ba79c59f9f
1 changed files with 1 additions and 0 deletions
  1. 1
    0
      lib/redmine/scm/adapters/git_adapter.rb

+ 1
- 0
lib/redmine/scm/adapters/git_adapter.rb View File

@@ -84,6 +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}).*$')
next unless branch_rev
bran = GitBranch.new(scm_iconv('UTF-8', @path_encoding, branch_rev[2]))
bran.revision = branch_rev[3]
bran.scmid = branch_rev[3]

Loading…
Cancel
Save