Refactored Diff::Display classes

3 files changed, 7 insertions, 5 deletions

diff --git a/vendor/ruby-git/lib/git/base.rb b/vendor/ruby-git/lib/git/base.rb
index f93eaf7..5082b8f 100644
--- a/vendor/ruby-git/lib/git/base.rb
+++ b/vendor/ruby-git/lib/git/base.rb
@@ -171,8 +171,8 @@ module Git
     end
     
     # returns a Git::Log object with count commits
-    def log(count = 30, skip = 0)
-      Git::Log.new(self, count, skip)
+    def log(count = 30, skip = 0, opts = {})
+      Git::Log.new(self, count, skip, opts)
     end
 
     # returns a Git::Status object
diff --git a/vendor/ruby-git/lib/git/lib.rb b/vendor/ruby-git/lib/git/lib.rb
index 0e74f5e..509beba 100644
--- a/vendor/ruby-git/lib/git/lib.rb
+++ b/vendor/ruby-git/lib/git/lib.rb
@@ -75,6 +75,7 @@ module Git
       arr_opts << "-#{opts[:count]}" if opts[:count]
       arr_opts << "--skip=#{opts[:skip]}" if opts[:skip]
       arr_opts << "--since=\"#{opts[:since]}\"" if opts[:since].is_a? String
+      arr_opts << "--all" if opts[:all] == true
       arr_opts << "#{opts[:between][0].to_s}..#{opts[:between][1].to_s}" if (opts[:between] && opts[:between].size == 2)
       arr_opts << opts[:object] if opts[:object].is_a? String
       arr_opts << '-- ' + opts[:path_limiter] if opts[:path_limiter].is_a? String
diff --git a/vendor/ruby-git/lib/git/log.rb b/vendor/ruby-git/lib/git/log.rb
index 4f81357..7a5cc94 100644
--- a/vendor/ruby-git/lib/git/log.rb
+++ b/vendor/ruby-git/lib/git/log.rb
@@ -15,11 +15,12 @@ module Git
     
     @dirty_flag = nil
     
-    def initialize(base, count = 30, skip = 0)
+    def initialize(base, count = 30, skip = 0, options = {})
       dirty_log
       @base = base
       @count = count
       @skip = skip
+      @options = options
     end
 
     def object(objectish)
@@ -85,9 +86,9 @@ module Git
       
       # actually run the 'git log' command
       def run_log      
-        log = @base.lib.full_log_commits(:count => @count, :object => @object, 
+        log = @base.lib.full_log_commits({:count => @count, :object => @object, 
                                     :path_limiter => @path, :since => @since, 
-                                    :between => @between, :skip => @skip)
+                                    :between => @between, :skip => @skip}.merge(@options))
         @commits = log.map { |c| Git::Object::Commit.new(@base, c['sha'], c) }
       end