[CHANGE] stop passing the --no-merges flag to git. Ohloh is going to import merges now.

[NEW] is_merge_commit? method helps Ohloh decide what to do with commits

Author: Robin Luckey

lib/scm/adapters/abstract/misc.rb

@@ -0,0 +1,9 @@
+module Scm::Adapters
+	class AbstractAdapter
+
+		def is_merge_commit?(commit)
+			false
+		end
+
+	end
+end

lib/scm/adapters/abstract_adapter.rb

@@ -23,3 +23,4 @@ class << self
 require 'lib/scm/adapters/abstract/system'
 require 'lib/scm/adapters/abstract/validation'
 require 'lib/scm/adapters/abstract/sha1'
+require 'lib/scm/adapters/abstract/misc'

lib/scm/adapters/git/commits.rb

@@ -49,7 +49,7 @@ def log(since=nil)
 
 
 		def rev_list_command(since=nil)
-			rev_list_options = "--root --reverse --no-merges --topo-order"
+			rev_list_options = "--root --reverse --topo-order"
 
 			if since
 				"cd '#{self.url}' && git rev-list #{rev_list_options} #{since}..HEAD #{self.branch_name}"

lib/scm/adapters/git/misc.rb

@@ -60,5 +60,9 @@ def create_tracking_branch(name)
 				run "cd '#{self.url}' && git branch -f #{name} origin/#{name}"
 			end
 		end
+
+		def is_merge_commit?(commit)
+			parent_tokens(commit).size > 1
+		end
 	end
 end

test/unit/git_misc_test.rb

@@ -25,5 +25,11 @@ def test_ls_tree
 			end
 		end
 
+		def test_is_merge_commit
+			with_git_repository('git_walk') do |git|
+				assert git.is_merge_commit?(Scm::Commit.new(:token => 'f264fb40c340a415b305ac1f0b8f12502aa2788f'))
+				assert !git.is_merge_commit?(Scm::Commit.new(:token => 'd067161caae2eeedbd74976aeff5c4d8f1ccc946'))
+			end
+		end
 	end
 end