summaryrefslogtreecommitdiffstats
path: root/lib/redmine/scm
diff options
context:
space:
mode:
authorGo MAEDA <maeda@farend.jp>2019-04-07 07:41:05 +0000
committerGo MAEDA <maeda@farend.jp>2019-04-07 07:41:05 +0000
commitb9e20c68a7c9aec40b088c03a09ab3b4690fea45 (patch)
tree2f89c008a3c4c6c63807e461639e1e3880c613ca /lib/redmine/scm
parent0a01dc7366d2a1cff8d557516e7b2780d0d4ba7e (diff)
downloadredmine-b9e20c68a7c9aec40b088c03a09ab3b4690fea45.tar.gz
redmine-b9e20c68a7c9aec40b088c03a09ab3b4690fea45.zip
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
Diffstat (limited to 'lib/redmine/scm')
-rw-r--r--lib/redmine/scm/adapters/git_adapter.rb1
1 files changed, 1 insertions, 0 deletions
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]