Merge 82d08a5 into ca49cdd

gitlabhq · Jun 1, 2013 · 5e70c54 · 5e70c54
2 parents ca49cdd + 82d08a5
commit 5e70c54
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/grit/repo.rb b/lib/grit/repo.rb
@@ -564,7 +564,7 @@ def log(commit = 'master', path = nil, options = {})
     #   +b+ is the other commit
     #   +paths+ is an optional list of file paths on which to restrict the diff
     def diff(a, b, *paths)
-      diff = self.git.native('diff', {}, a, b, '--', *paths)
+      diff = self.git.native('diff', {:full_index => true}, a, b, '--', *paths)
 
       if diff =~ /diff --git a/
         diff = diff.sub(/.*?(diff --git a)/m, '\1')