Merge pull request #327 from arr2036/master

Pass :is_bare to Grit where appropriate.
This commit is contained in:
bootstraponline
2012-05-09 08:57:18 -07:00
2 changed files with 4 additions and 3 deletions
+2 -2
View File
@@ -9,10 +9,10 @@ module Gollum
# page_file_dir - String the directory in which all page files reside # page_file_dir - String the directory in which all page files reside
# #
# Returns this instance. # Returns this instance.
def initialize(path, page_file_dir = nil) def initialize(path, page_file_dir = nil, bare = false)
@page_file_dir = page_file_dir @page_file_dir = page_file_dir
@path = path @path = path
@repo = Grit::Repo.new(path) @repo = Grit::Repo.new(path, { :is_bare => bare })
clear clear
end end
+2 -1
View File
@@ -151,8 +151,9 @@ module Gollum
path = path.path path = path.path
end end
@path = path @path = path
@repo_is_bare = options[:repo_is_bare]
@page_file_dir = options[:page_file_dir] @page_file_dir = options[:page_file_dir]
@access = options[:access] || GitAccess.new(path, @page_file_dir) @access = options[:access] || GitAccess.new(path, @page_file_dir, @repo_is_bare)
@base_path = options[:base_path] || "/" @base_path = options[:base_path] || "/"
@page_class = options[:page_class] || self.class.page_class @page_class = options[:page_class] || self.class.page_class
@file_class = options[:file_class] || self.class.file_class @file_class = options[:file_class] || self.class.file_class