separate argv in calls to Git#native

mojombo · Dec 9, 2010 · ce31d0d · ce31d0d
1 parent 1cfcc1b
commit ce31d0d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/lib/grit/commit.rb b/lib/grit/commit.rb
@@ -194,7 +194,7 @@ def self.diff(repo, a, b = nil, paths = [], options = {})
 
     def show
       if parents.size > 1
-        diff = @repo.git.native("diff #{parents[0].id}...#{parents[1].id}", {:full_index => true})
+        diff = @repo.git.native(:diff, {:full_index => true}, "#{parents[0].id}...#{parents[1].id}")
       else
         diff = @repo.git.show({:full_index => true, :pretty => 'raw'}, @id)
       end

diff --git a/lib/grit/repo.rb b/lib/grit/repo.rb
@@ -457,7 +457,8 @@ def diff_objects(commit_sha, parents = true)
       else
         # NO PARENTS:
         cmd = "-r -t #{commit_sha}"
-        revs = self.git.method_missing('ls-tree', {:timeout => false}, "-r -t #{commit_sha}").split("\n").map{ |a| a.split("\t").first.split(' ')[2] }
+        revs = self.git.native(:ls_tree, {:timeout => false, :r => true, :t => true}, commit_sha).
+          split("\n").map{ |a| a.split("\t").first.split(' ')[2] }
       end
       revs << self.commit(commit_sha).tree.id
       Grit.no_quote = false