more efficient commit count

mojombo · Oct 21, 2008 · 6571f70 · 6571f70
1 parent 6b86674
commit 6571f70
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/lib/grit/commit.rb b/lib/grit/commit.rb
@@ -71,7 +71,7 @@ def lazy_source
     #
     # Returns Integer
     def self.count(repo, ref)
-      repo.git.rev_list({}, ref).strip.split("\n").size
+      repo.git.rev_list({}, ref).size / 41
     end
 
     # Find all commits matching the given criteria.

diff --git a/lib/grit/git-ruby.rb b/lib/grit/git-ruby.rb
@@ -51,7 +51,7 @@ def rev_list(options, ref = 'master')
       elsif (options.size == 0)
         # pure rev-list
         begin
-          return file_index.commits_from(rev_parse({}, ref)).join("\n")
+          return file_index.commits_from(rev_parse({}, ref)).join("\n") + "\n"
         rescue
           return method_missing('rev-list', options, ref) 
         end

diff --git a/test/test_commit.rb b/test/test_commit.rb
@@ -22,6 +22,12 @@ def test_id_abbrev
     assert_equal '80f136f', @r.commit('80f136f500dfdb8c3e8abf4ae716f875f0a1b57f').id_abbrev
   end
 
+  # count
+
+  def test_count
+    assert_equal 107, Commit.count(@r, 'master')
+  end
+
   # diff
 
   def test_diff

diff --git a/test/test_rubygit.rb b/test/test_rubygit.rb
@@ -128,7 +128,7 @@ def test_rev_list_pretty_raw
 
   def test_rev_list
     out = @git.rev_list({}, 'master')
-    assert_equal out, fixture('rev_list_lines').chomp
+    assert_equal out, fixture('rev_list_lines')
   end
 
   def test_rev_list_range