--- a/vendor/grit/.gitignore
+++ b/vendor/grit/.gitignore
@@ -1,3 +1,4 @@
 coverage
 pkg
 doc
+test/specifics.rb

--- a/vendor/grit/Rakefile
+++ b/vendor/grit/Rakefile
@@ -10,6 +10,7 @@ Hoe.new('grit', Grit::VERSION) do |p|
   p.description = p.paragraphs_of('README.txt', 2..2).join("\n\n")
   p.url = p.paragraphs_of('README.txt', 0).first.split(/\n/)[2..-1].map { |u| u.strip }
   p.changes = p.paragraphs_of('History.txt', 0..1).join("\n\n")
+  p.extra_deps << ['mime-types']
 end
 
 desc "Open an irb session preloaded with this library"

--- a/vendor/grit/lib/grit.rb
+++ b/vendor/grit/lib/grit.rb
@@ -2,6 +2,7 @@ $:.unshift File.dirname(__FILE__) # For use/testing when no gem is installed
 
 # core
 require 'fileutils'
+require 'time'
 
 # stdlib
 
@@ -20,6 +21,7 @@ require 'grit/tree'
 require 'grit/blob'
 require 'grit/actor'
 require 'grit/diff'
+require 'grit/config'
 require 'grit/repo'
 require 'grit/stats'
 

--- a/vendor/grit/lib/grit/commit.rb
+++ b/vendor/grit/lib/grit/commit.rb
@@ -1,8 +1,6 @@
 module Grit
   
   class Commit
-    include Lazy
-    
     attr_reader :id
     lazy_reader :parents
     lazy_reader :tree
@@ -35,8 +33,6 @@ module Grit
       @committed_date = committed_date
       @message = message.join("\n")
       @short_message = message[0] || ''
-      
-      __baked__
     end
     
     def id_abbrev
@@ -58,40 +54,15 @@ module Grit
     #
     # Returns Grit::Commit (unbaked)
     def create_initialize(repo, atts)
-      @repo = nil
-      @id = nil
-      @parents = nil
-      @tree = nil
-      @author = nil
-      @authored_date = nil
-      @committer = nil
-      @committed_date = nil
-      @message = nil
-      @short_message = nil
-      @__baked__ = nil
-      
       @repo = repo
       atts.each do |k, v|
-        instance_variable_set("@#{k}".to_sym, v)
+        instance_variable_set("@#{k}", v)
       end
       self
     end
     
-    # Use the id of this instance to populate all of the other fields
-    # when any of them are called.
-    #
-    # Returns nil
-    def __bake__
-      temp = self.class.find_all(@repo, @id, {:max_count => 1}).first
-      @parents = temp.parents
-      @tree = temp.tree
-      @author = temp.author
-      @authored_date = temp.authored_date
-      @committer = temp.committer
-      @committed_date = temp.committed_date
-      @message = temp.message
-      @short_message = temp.short_message
-      nil
+    def lazy_source
+      self.class.find_all(@repo, @id, {:max_count => 1}).first
     end
     
     # Count the number of commits reachable from this ref
@@ -105,7 +76,7 @@ module Grit
     
     # Find all commits matching the given criteria.
     #   +repo+ is the Repo
-    #   +ref+ is the ref from which to begin (SHA1 or name)
+    #   +ref+ is the ref from which to begin (SHA1 or name) or nil for --all
     #   +options+ is a Hash of optional arguments to git
     #     :max_count is the maximum number of commits to fetch
     #     :skip is the number of commits to skip
@@ -117,7 +88,11 @@ module Grit
       default_options = {:pretty => "raw"}
       actual_options = default_options.merge(options)
       
-      output = repo.git.rev_list(actual_options, ref)
+      if ref
+        output = repo.git.rev_list(actual_options, ref)
+      else
+        output = repo.git.rev_list(actual_options.merge(:all => true))
+      end
       
       self.list_from_string(repo, output)
     end
@@ -224,6 +199,25 @@ module Grit
       m, actor, epoch = *line.match(/^.+? (.*) (\d+) .*$/)
       [Actor.from_string(actor), Time.at(epoch.to_i)]
     end
+
+    def to_hash
+      {
+        'id'       => id,
+        'parents'  => parents.map { |p| { 'id' => p.id } },
+        'tree'     => tree.id,
+        'message'  => message,
+        'author'   => {
+          'name'  => author.name,
+          'email' => author.email
+        },
+        'committer' => {
+          'name'  => committer.name,
+          'email' => committer.email
+        },
+        'authored_date'  => authored_date.xmlschema,
+        'committed_date' => committed_date.xmlschema,
+      }
+    end
   end # Commit
   
 end # Grit

--- /dev/null
+++ b/vendor/grit/lib/grit/config.rb
@@ -0,0 +1,44 @@
+module Grit
+  
+  class Config
+    def initialize(repo)
+      @repo = repo
+    end
+    
+    def []=(key, value)
+      @repo.git.config({}, key, value)
+      @data = nil
+    end
+    
+    def [](key)
+      data[key]
+    end
+    
+    def fetch(key, default = nil)
+      data[key] || default || raise(IndexError.new("key not found"))
+    end
+    
+    def keys
+      data.keys
+    end
+    
+    protected
+      def data
+        @data ||= load_config
+      end
+      
+      def load_config
+        hash = {}
+        config_lines.map do |line|
+          key, value = line.split(/=/, 2)
+          hash[key] = value
+        end
+        hash
+      end
+      
+      def config_lines
+        @repo.git.config(:list => true).split(/\n/)
+      end
+  end # Config
+  
+end # Grit
\ No newline at end of file

--- a/vendor/grit/lib/grit/diff.rb
+++ b/vendor/grit/lib/grit/diff.rb
@@ -26,14 +26,14 @@ module Grit
       diffs = []
       
       while !lines.empty?
-        m, a_path, b_path = *lines.shift.match(%r{^diff --git a/(\S+) b/(\S+)$})
+        m, a_path, b_path = *lines.shift.match(%r{^diff --git a/(.+?) b/(.+)$})
         
         if lines.first =~ /^old mode/
           m, a_mode = *lines.shift.match(/^old mode (\d+)/)
           m, b_mode = *lines.shift.match(/^new mode (\d+)/)
         end
         
-        if lines.first =~ /^diff --git/
+        if lines.empty? || lines.first =~ /^diff --git/
           diffs << Diff.new(repo, a_path, b_path, nil, nil, a_mode, b_mode, false, false, nil)
           next
         end
@@ -67,4 +67,4 @@ module Grit
     end
   end # Diff
   
-end # Grit
\ No newline at end of file
+end # Grit

--- a/vendor/grit/lib/grit/git.rb
+++ b/vendor/grit/lib/grit/git.rb
@@ -73,4 +73,4 @@ module Grit
     end
   end # Git
   
-end # Grit
+end # Grit
\ No newline at end of file

--- a/vendor/grit/lib/grit/lazy.rb
+++ b/vendor/grit/lib/grit/lazy.rb
@@ -1,53 +1,33 @@
+##
 # Allows attributes to be declared as lazy, meaning that they won't be
-# computed until they are asked for. Just mix this module in:
+# computed until they are asked for. 
 #
-#   class Foo
-#     include Lazy
-#     ...
-#   end
-#
-# To specify a lazy reader:
-#
-#   lazy_reader :att
+# Works by delegating each lazy_reader to a cached lazy_source method.
 #
-# Then, define a method called __bake__ that computes all your lazy
-# attributes:
+# class Person
+#   lazy_reader :eyes
 #
-#   def __bake__
-#     @att = ...
+#   def lazy_source
+#     OpenStruct.new(:eyes => 2)
 #   end
+# end
 #
-# If you happen to have already done all the hard work, you can mark an instance
-# as already baked by calling:
+# >> Person.new.eyes
+# => 2
 #
-#   __baked__
-#
-# That's it! (Tom Preston-Werner: rubyisawesome.com)
 module Lazy
-  module ClassMethods
-    def lazy_reader(*args)
-      args.each do |arg|
-        define_method(arg) do
-          val = instance_variable_get("@#{arg}")
+  def lazy_reader(*args)
+    args.each do |arg|
+      ivar = "@#{arg}"
+      define_method(arg) do
+        if instance_variables.include?(ivar)
+          val = instance_variable_get(ivar)
           return val if val
-          self.__prebake__
-          instance_variable_get("@#{arg}")
         end
+        instance_variable_set(ivar, (@lazy_source ||= lazy_source).send(arg))
       end
     end
   end
-  
-  def __prebake__
-    return if @__baked__
-    self.__bake__
-    @__baked__ = true
-  end
-  
-  def __baked__
-    @__baked__ = true
-  end
-  
-  def self.included(base)
-    base.extend(ClassMethods)
-  end 
-end
\ No newline at end of file
+end
+
+Object.extend Lazy unless Object.ancestors.include? Lazy

--- a/vendor/grit/lib/grit/repo.rb
+++ b/vendor/grit/lib/grit/repo.rb
@@ -89,10 +89,11 @@ module Grit
     # Commits are returned in chronological order.
     #   +start+ is the branch/commit name (default 'master')
     #   +since+ is a string represeting a date/time
+    #   +extra_options+ is a hash of extra options
     #
     # Returns Grit::Commit[] (baked)
-    def commits_since(start = 'master', since = '1970-01-01')
-      options = {:since => since}
+    def commits_since(start = 'master', since = '1970-01-01', extra_options = {})
+      options = {:since => since}.merge(extra_options)
       
       Commit.find_all(self, start, options)
     end
@@ -253,11 +254,7 @@ module Grit
     #
     # Returns nothing
     def enable_daemon_serve
-      if @bare
-        FileUtils.touch(File.join(self.path, DAEMON_EXPORT_FILE))
-      else
-        FileUtils.touch(File.join(self.path, '.git', DAEMON_EXPORT_FILE))
-      end
+      FileUtils.touch(File.join(self.path, DAEMON_EXPORT_FILE))
     end
     
     # Disable git-daemon serving of this repository by ensuring there is no
@@ -265,11 +262,7 @@ module Grit
     #
     # Returns nothing
     def disable_daemon_serve
-      if @bare
-        FileUtils.rm_f(File.join(self.path, DAEMON_EXPORT_FILE))
-      else
-        FileUtils.rm_f(File.join(self.path, '.git', DAEMON_EXPORT_FILE))
-      end
+      FileUtils.rm_f(File.join(self.path, DAEMON_EXPORT_FILE))
     end
     
     # The list of alternates for this repo
@@ -305,6 +298,10 @@ module Grit
       end
     end
     
+    def config
+      @config ||= Config.new(self)
+    end
+    
     # Pretty object inspection
     def inspect
       %Q{#<Grit::Repo "#{@path}">}

--- a/vendor/grit/lib/grit/tree.rb
+++ b/vendor/grit/lib/grit/tree.rb
@@ -1,18 +1,11 @@
 module Grit
   
   class Tree
-    include Lazy
-    
     lazy_reader :contents
     attr_reader :id
     attr_reader :mode
     attr_reader :name
     
-    def initialize
-      @contents = nil
-      @__baked__ = nil
-    end
-    
     # Construct the contents of the tree
     #   +repo+ is the Repo
     #   +treeish+ is the reference
@@ -29,19 +22,17 @@ module Grit
       @repo = repo
       @id = id
       @contents = []
-      @__baked__ = nil
       
       text.split("\n").each do |line|
         @contents << content_from_string(repo, line)
       end
       @contents.compact!
-      __baked__
+
       self
     end
     
-    def __bake__
-      temp = Tree.construct(@repo, @id, [])
-      @contents = temp.contents
+    def lazy_source
+      Tree.construct(@repo, @id, [])
     end
     
     # Create an unbaked Tree containing just the specified attributes
@@ -60,11 +51,9 @@ module Grit
     # Returns Grit::Tree (unbaked)
     def create_initialize(repo, atts)
       @repo = repo
-      @contents = nil
-      @__baked__ = nil
       
       atts.each do |k, v|
-        instance_variable_set("@#{k}".to_sym, v)
+        instance_variable_set("@#{k}", v)
       end
       self
     end
@@ -111,4 +100,4 @@ module Grit
     end
   end # Tree
   
-end # Grit
\ No newline at end of file
+end # Grit

--- a/vendor/grit/test/fixtures/diff_new_mode
+++ b/vendor/grit/test/fixtures/diff_new_mode
@@ -12,3 +12,6 @@ index 9ec1bac..1c4f83b
      "django.middleware.common.CommonMiddleware",
      "django.contrib.sessions.middleware.SessionMiddleware",
      "django.contrib.auth.middleware.AuthenticationMiddleware",
+diff --git a/moo b/moo
+old mode 100755
+new mode 100644

--- /dev/null
+++ b/vendor/grit/test/fixtures/simple_config
@@ -0,0 +1,2 @@
+core.bare=false
+remote.origin.url=git://github.com/mojombo/grit.git
\ No newline at end of file

--- a/vendor/grit/test/test_commit.rb
+++ b/vendor/grit/test/test_commit.rb
@@ -172,4 +172,26 @@ class TestCommit < Test::Unit::TestCase
     @c = Commit.create(@r, :id => 'abc')
     assert_equal %Q{#<Grit::Commit "abc">}, @c.inspect
   end
+
+  # to_hash
+
+  def test_to_hash
+    @c = Commit.create(@r, :id => '4c8124ffcf4039d292442eeccabdeca5af5c5017')
+
+    expected = {
+      'parents' => ['id' => "634396b2f541a9f2d58b00be1a07f0c358b999b3"],
+      'committed_date' => Time.parse("2007-10-10T00:06:12-07:00").localtime.xmlschema,
+      'tree' => "672eca9b7f9e09c22dcb128c283e8c3c8d7697a4",
+      'authored_date' => Time.parse("2007-10-10T00:06:12-07:00").localtime.xmlschema,
+      'committer' => {'email' => "tom@mojombo.com", 'name' => "Tom Preston-Werner"},
+      'message' => "implement Grit#heads",
+      'author' => {'email' => "tom@mojombo.com", 'name' => "Tom Preston-Werner"},
+      'id' => "4c8124ffcf4039d292442eeccabdeca5af5c5017"
+    }
+    
+    generated_hash = @c.to_hash
+    expected.keys.each do |exp_key|
+      assert_equal expected[exp_key], generated_hash[exp_key]
+    end
+  end
 end

--- /dev/null
+++ b/vendor/grit/test/test_config.rb
@@ -0,0 +1,58 @@
+require File.dirname(__FILE__) + '/helper'
+
+class TestConfig < Test::Unit::TestCase
+  def setup
+    @r = Repo.new(GRIT_REPO)
+  end
+  
+  # data
+  
+  def test_bracketed_fetch
+    Git.any_instance.expects(:config).returns(fixture('simple_config'))
+    
+    config = @r.config
+    
+    assert_equal "git://github.com/mojombo/grit.git", config["remote.origin.url"]
+  end
+  
+  def test_bracketed_fetch_returns_nil
+    Git.any_instance.expects(:config).returns(fixture('simple_config'))
+    
+    config = @r.config
+    
+    assert_equal nil, config["unknown"]
+  end
+  
+  def test_fetch
+    Git.any_instance.expects(:config).returns(fixture('simple_config'))
+    
+    config = @r.config
+    
+    assert_equal "false", config.fetch("core.bare")
+  end
+  
+  def test_fetch_with_default
+    Git.any_instance.expects(:config).returns(fixture('simple_config'))
+    
+    config = @r.config
+    
+    assert_equal "default", config.fetch("unknown", "default")
+  end
+
+  def test_fetch_without_default_raises
+    Git.any_instance.expects(:config).returns(fixture('simple_config'))
+    
+    config = @r.config
+    
+    assert_raise(IndexError) do
+      config.fetch("unknown")
+    end
+  end
+  
+  def test_set_value
+    Git.any_instance.expects(:config).with({}, 'unknown', 'default')
+    
+    config = @r.config
+    config["unknown"] = "default"
+  end
+end

--- a/vendor/grit/test/test_diff.rb
+++ b/vendor/grit/test/test_diff.rb
@@ -11,7 +11,8 @@ class TestDiff < Test::Unit::TestCase
     output = fixture('diff_new_mode')
     
     diffs = Diff.list_from_string(@r, output)
-    assert_equal 1, diffs.size
+    assert_equal 2, diffs.size
     assert_equal 10, diffs.first.diff.split("\n").size
+    assert_equal nil, diffs.last.diff
   end
 end

--- a/vendor/grit/test/test_git.rb
+++ b/vendor/grit/test/test_git.rb
@@ -21,6 +21,10 @@ class TestGit < Test::Unit::TestCase
     assert_equal "\\'foo\\'", @git.e("'foo'")
   end
   
+  def test_method_missing
+    assert_match(/^git version [\w\.]*$/, @git.version)
+  end
+  
   def test_transform_options
     assert_equal ["-s"], @git.transform_options({:s => true})
     assert_equal ["-s '5'"], @git.transform_options({:s => 5})
@@ -47,4 +51,5 @@ class TestGit < Test::Unit::TestCase
     @git.expects(:execute).with("#{@git_bin_base} foo 'bar\\'s'")
     @git.foo({}, "bar's")
   end
-end
\ No newline at end of file
+end
+

--- a/vendor/grit/test/test_repo.rb
+++ b/vendor/grit/test/test_repo.rb
@@ -186,14 +186,14 @@ class TestRepo < Test::Unit::TestCase
   # enable_daemon_serve
   
   def test_enable_daemon_serve
-    FileUtils.expects(:touch).with(File.join(@r.path, '.git', 'git-daemon-export-ok'))
+    FileUtils.expects(:touch).with(File.join(@r.path, 'git-daemon-export-ok'))
     @r.enable_daemon_serve
   end
   
   # disable_daemon_serve
   
   def test_disable_daemon_serve
-    FileUtils.expects(:rm_f).with(File.join(@r.path, '.git', 'git-daemon-export-ok'))
+    FileUtils.expects(:rm_f).with(File.join(@r.path, 'git-daemon-export-ok'))
     @r.disable_daemon_serve
   end