Merge branch 'master' of git://github.com/elliottcable/ruby-git

Daniel Mendler · Daniel Mendler · commit 86b45edcfe00 · 2009-02-12T17:41:19.000+01:00
Conflicts:
	lib/git/lib.rb
diff --git a/lib/git/lib.rb b/lib/git/lib.rb
@@ -463,7 +463,7 @@ def checkout_file(version, file)
     def merge(branch, message = nil)      
       arr_opts = []
       arr_opts << '-m' << message if message
-      arr_opts += branch.to_a
+      arr_opts += [branch]
       command('merge', arr_opts)
     end
 
@@ -543,7 +543,7 @@ def gc
     def read_tree(treeish, opts = {})
       arr_opts = []
       arr_opts << "--prefix=#{opts[:prefix]}" if opts[:prefix]
-      arr_opts += treeish.to_a
+      arr_opts += [treeish]
       command('read-tree', arr_opts)
     end
     
@@ -560,7 +560,7 @@ def commit_tree(tree, opts = {})
       arr_opts = []
       arr_opts << tree
       arr_opts << '-p' << opts[:parent] if opts[:parent]
-      arr_opts += opts[:parents].map { |p| ['-p', p] }.flatten if opts[:parents]
+      arr_opts += [opts[:parents]].map { |p| ['-p', p] }.flatten if opts[:parents]
       command('commit-tree', arr_opts, true, "< #{escape t.path}")
     end
     
@@ -617,7 +617,7 @@ def command(cmd, opts = [], chdir = true, redirect = '', &block)
       ENV['GIT_WORK_TREE'] = @git_work_dir
       path = @git_work_dir || @git_dir || @path
 
-      opts = opts.map {|s| escape(s) }.join(' ')
+      opts = [opts].flatten.map {|s| escape(s) }.join(' ')
       git_cmd = "git #{cmd} #{opts} #{redirect} 2>&1"
 
       out = nil
diff --git a/lib/git/object.rb b/lib/git/object.rb
@@ -262,9 +262,9 @@ def self.new(base, objectish, type = nil, is_tag = false)
       type ||= base.lib.object_type(objectish)
       klass =
         case type
-        when /blob/:   Blob   
-        when /commit/: Commit
-        when /tree/:   Tree
+        when /blob/   then Blob   
+        when /commit/ then Commit
+        when /tree/   then Tree
         end
       klass.new(base, objectish)
     end
diff --git a/ruby-git.gemspec b/ruby-git.gemspec
@@ -1,7 +1,7 @@
 spec = Gem::Specification.new do |s|
     s.platform  =   Gem::Platform::RUBY
     s.name      =   "git"
-    s.version   =   "1.0.7"
+    s.version   =   "1.0.8"
     s.author    =   "Scott Chacon"
     s.email     =   "schacon@gmail.com"
     s.summary   =   "A package for using Git in Ruby code."
