From ae27382632423a09095715842c6af2bcb6a3dc62 Mon Sep 17 00:00:00 2001 From: nobu Date: Sat, 17 Jan 2015 13:56:28 +0000 Subject: [PATCH] vcs.rb: no empty names * tool/vcs.rb (get_revisions): branch names must not be empty. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49304 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- tool/vcs.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tool/vcs.rb b/tool/vcs.rb index 9371ae287d..d4b87ec781 100644 --- a/tool/vcs.rb +++ b/tool/vcs.rb @@ -135,7 +135,7 @@ class VCS info_xml = IO.pread(%W"svn info --xml #{path}") _, last, _, changed, _ = info_xml.split(/revision="(\d+)"/) modified = info_xml[/([^<>]*)/, 1] - branch = info_xml[%r'\^/(?:branches/|tags/)?([^<>]*)', 1] + branch = info_xml[%r'\^/(?:branches/|tags/)?([^<>]+)', 1] [last, changed, modified, branch] end @@ -209,7 +209,7 @@ class VCS cmd = %W[git] cmd.push("-C", srcdir) if srcdir cmd.push("symbolic-ref", "HEAD") - branch = IO.pread(cmd)[%r'\A(?:refs/heads/)?(.*)', 1] + branch = IO.pread(cmd)[%r'\A(?:refs/heads/)?(.+)', 1] [last, changed, modified, branch] end