wiki.ohea.xyz/gollum
10
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

awkwardly named method

Browse Source
This commit is contained in:
rick
2010-12-08 15:39:41 -08:00
parent 9843f4c739
commit a8f74a7e7c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/gollum/wiki.rb
+2 -2
View File
@@ -317,7 +317,7 @@ module Gollum
end end
pcommit = @repo.commit('master') pcommit = @repo.commit('master')
patch = full_diff_for(page, sha1, sha2) patch = full_reverse_diff_for(page, sha1, sha2)
commit[:parent] = [pcommit] commit[:parent] = [pcommit]
commit[:tree] = @repo.git.apply_patch(pcommit.sha, patch) commit[:tree] = @repo.git.apply_patch(pcommit.sha, patch)
@@ -551,7 +551,7 @@ module Gollum
index.commit(options[:message], options[:parent], actor) index.commit(options[:message], options[:parent], actor)
end 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? sha1, sha2 = "#{sha1}^", sha1 if sha2.nil?
repo.git.native(:diff, {:R => true}, sha1, sha2, '--', page.path) repo.git.native(:diff, {:R => true}, sha1, sha2, '--', page.path)
end end