add merge commit diff support

ajit766 · Dec 2, 2009 · 5251fd6 · 5251fd6
1 parent 1911fe1
commit 5251fd6
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/lib/grit/commit.rb b/lib/grit/commit.rb
@@ -162,7 +162,12 @@ def self.diff(repo, a, b = nil, paths = [])
     end
 
     def show
-      diff = @repo.git.show({:full_index => true, :pretty => 'raw'}, @id)
+      if parents.size > 1
+        diff = @repo.git.native("diff #{parents[0].id}..#{parents[1].id}", {:full_index => true})
+      else
+        diff = @repo.git.show({:full_index => true, :pretty => 'raw'}, @id)
+      end
+
       if diff =~ /diff --git a/
         diff = diff.sub(/.+?(diff --git a)/m, '\1')
       else