From: Go MAEDA Date: Sun, 7 Apr 2019 07:41:05 +0000 (+0000) Subject: Merged r18046 from trunk to 4.0-stable (#31120). X-Git-Tag: 4.0.4~24 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=b9e20c68a7c9aec40b088c03a09ab3b4690fea45;p=redmine.git Merged r18046 from trunk to 4.0-stable (#31120). git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@18047 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- diff --git a/lib/redmine/scm/adapters/git_adapter.rb b/lib/redmine/scm/adapters/git_adapter.rb index fcc77f393..4f889d0b1 100644 --- a/lib/redmine/scm/adapters/git_adapter.rb +++ b/lib/redmine/scm/adapters/git_adapter.rb @@ -82,6 +82,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(branch_rev[2]) bran.revision = branch_rev[3] bran.scmid = branch_rev[3]