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
This commit is contained in:
Go MAEDA
2019-04-07 07:02:08 +00:00
parent 25ec4a9366
commit ba79c59f9f

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]