From ba79c59f9f375fdbd9303d2cab7bac5df59746f7 Mon Sep 17 00:00:00 2001 From: Go MAEDA Date: Sun, 7 Apr 2019 07:02:08 +0000 Subject: [PATCH] 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 --- lib/redmine/scm/adapters/git_adapter.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/redmine/scm/adapters/git_adapter.rb b/lib/redmine/scm/adapters/git_adapter.rb index 339a4e939..c8e5629e6 100644 --- a/lib/redmine/scm/adapters/git_adapter.rb +++ b/lib/redmine/scm/adapters/git_adapter.rb @@ -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]