Account for not having a tiny git version (ie 1.6.4)

technicalpickles · technicalpickles · commit 4cc87eb54780 · 2009-08-02T04:01:34.000-04:00
diff --git a/lib/git/lib.rb b/lib/git/lib.rb
@@ -647,7 +647,7 @@ def archive(sha, file = nil, opts = {})
     # returns the current version of git, as an Array of Fixnums.
     def current_command_version
       output = command('version', [], false)
-      version = output[/(\d+)\.(\d+)\.(\d+)\.(\d+)/]
+      version = output[/\d+\.\d+(\.\d+)+/]
       version.split('.').collect {|i| i.to_i}
     end
 
@@ -658,10 +658,11 @@ def required_command_version
     def meets_required_version?
       current_version  = self.current_command_version
       required_version = self.required_command_version
+
       return current_version[0] >= required_version[0] && 
              current_version[1] >= required_version[1] &&
-             current_version[2] >= required_version[2] &&
-             current_version[3] >= required_version[3]
+             (current_version[2] ? current_version[2] >= required_version[2] : true) &&
+             (current_version[3] ? current_version[3] >= required_version[3] : true)
     end
 
 
