allow non-bare repositories

square-circle-triangle · Dec 16, 2009 · 51147ac · 51147ac
1 parent 1f21d8f
commit 51147ac
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/lib/grit/git-ruby.rb b/lib/grit/git-ruby.rb
@@ -11,8 +11,10 @@ module GitRuby
     attr_accessor :ruby_git_repo, :git_file_index
 
     def init(options = {})
-      if options.size == 0
-        Grit::GitRuby::Repository.init(@git_dir)
+      bare = options.has_key?(:bare) ? options[:bare] : true
+
+      if options.size == 0 || (options.size == 1 && options.has_key?(:bare))
+        Grit::GitRuby::Repository.init(@git_dir, bare)
       else
         method_missing('init', options)
       end

diff --git a/lib/grit/repo.rb b/lib/grit/repo.rb
@@ -59,7 +59,15 @@ def self.init(path, options = {})
 
       git = Git.new(path, working_dir)
 
-      git.init
+      if options.has_key?(:bare)
+        bare = options[:bare]
+      elsif options.has_key?(:is_bare)
+        bare = options[:is_bare]
+      else
+        bare = true
+      end
+
+      git.init(:bare => bare)
 
       Repo.new(path)
     end