sometimes reverts fail, yo

2010-12-08 15:55:35 -08:00
parent d436f5f112
commit e2fbac96cb
2 changed files with 6 additions and 0 deletions
@@ -320,6 +320,7 @@ module Gollum
      patch   = full_reverse_diff_for(page, sha1, sha2)
      commit[:parent] = [pcommit]
      commit[:tree]   = @repo.git.apply_patch(pcommit.sha, patch)
+      return false unless commit[:tree]

      index = nil
      sha1  = commit_index(commit) { |i| index = i }