allow empty emails

gitlabhq · Jan 27, 2015 · b4851f8 · b4851f8
1 parent d8121f7
commit b4851f8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/grit/actor.rb b/lib/grit/actor.rb
@@ -17,8 +17,8 @@ def initialize(name, email)
     # Returns Git::Actor.
     def self.from_string(str)
       case str
-        when /<.+>/
-          m, name, email = *str.match(/(.*) <(.+?)>/)
+        when /<.*>/
+          m, name, email = *str.match(/(.*) <(.*?)>/)
           return self.new(name, email)
         else
           return self.new(str, nil)

diff --git a/lib/grit/git-ruby/git_object.rb b/lib/grit/git-ruby/git_object.rb
@@ -29,7 +29,7 @@ def initialize(str)
       if !m
         case str
         when /<.+>/
-          m, @name, @email = *str.match(/(.*) <(.+?)>/)
+          m, @name, @email = *str.match(/(.*) <(.*?)>/)
         else
           @name = str
         end