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

use a temp GIT_INDEX_FILE when working with the real git index (during reverts)

Browse Source
This commit is contained in:
rick
2010-12-08 15:17:18 -08:00
parent 057baac3ce
commit 074b2119fa
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/gollum/wiki.rb
+11 -1
View File
@@ -557,10 +557,20 @@ module Gollum
end end
def write_to_real_index(head_sha) def write_to_real_index(head_sha)
old_index = ENV['GIT_INDEX_FILE']
temp_index = @repo.git.create_tempfile('index', :clean)
ENV['GIT_INDEX_FILE'] = temp_index
@repo.git.native('read-tree', {}, head_sha) @repo.git.native('read-tree', {}, head_sha)
if yield if yield
@repo.git.native('write-tree') tree_sha = @repo.git.native('write-tree')
after_index = ENV['GIT_INDEX_FILE']
if after_index != temp_index
raise 'environment was changed for the git call'
end end
tree_sha
end
ensure
ENV['GIT_INDEX_FILE'] = old_index
end end
def full_diff_for(page, sha1, sha2 = nil) def full_diff_for(page, sha1, sha2 = nil)