Fixed: unexpected nil when viewing differences on CVS (#1444).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1525 e93f8b46-1217-0410-a6f0-8f06a7374b81
2008-06-14 10:51:15 +00:00 · 2008-06-14 10:51:15 +00:00 · b42b697ffb
parent cc9b8f7878
commit b42b697ffb
1 changed files with 2 additions and 1 deletions
--- a/app/models/repository/cvs.rb
+++ b/app/models/repository/cvs.rb
@ -76,7 +76,8 @@ class Repository::Cvs < Repository
        unless revision_to
          revision_to=scm.get_previous_revision(revision_from)
        end
-        diff=diff+scm.diff(change_from.path, revision_from, revision_to)
+        file_diff = scm.diff(change_from.path, revision_from, revision_to)
+        diff = diff + file_diff unless file_diff.nil?
      end
    end
    return diff