From: Go MAEDA Date: Sun, 7 Apr 2019 07:42:58 +0000 (+0000) Subject: Merged r18046 from trunk to 3.4-stable (#31120). X-Git-Tag: 3.4.11~12 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=d8ee0bb0080f4abd957d763211d64623c7d35e48;p=redmine.git Merged r18046 from trunk to 3.4-stable (#31120). git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@18048 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..481d6138f 100644 --- a/lib/redmine/scm/adapters/git_adapter.rb +++ b/lib/redmine/scm/adapters/git_adapter.rb @@ -83,6 +83,7 @@ module Redmine io.each_line do |line| branch_rev = line.match('\s*(\*?)\s*(.*?)\s*([0-9a-f]{40}).*$') bran = GitBranch.new(branch_rev[2]) + next unless branch_rev bran.revision = branch_rev[3] bran.scmid = branch_rev[3] bran.is_default = ( branch_rev[1] == '*' )