From a8f74a7e7cb136eca6b48ea182cc113292f4e10e Mon Sep 17 00:00:00 2001 From: rick Date: Wed, 8 Dec 2010 15:39:41 -0800 Subject: [PATCH] awkwardly named method --- lib/gollum/wiki.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/gollum/wiki.rb b/lib/gollum/wiki.rb index 8eab9f59..309aebcf 100644 --- a/lib/gollum/wiki.rb +++ b/lib/gollum/wiki.rb @@ -317,7 +317,7 @@ module Gollum end pcommit = @repo.commit('master') - patch = full_diff_for(page, sha1, sha2) + patch = full_reverse_diff_for(page, sha1, sha2) commit[:parent] = [pcommit] commit[:tree] = @repo.git.apply_patch(pcommit.sha, patch) @@ -551,7 +551,7 @@ module Gollum index.commit(options[:message], options[:parent], actor) end - def full_diff_for(page, sha1, sha2 = nil) + def full_reverse_diff_for(page, sha1, sha2 = nil) sha1, sha2 = "#{sha1}^", sha1 if sha2.nil? repo.git.native(:diff, {:R => true}, sha1, sha2, '--', page.path) end