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

[obnox/ohloh/ohloh_scm.git] / lib / scm / adapters / git / misc.rb

diff --git a/lib/scm/adapters/git/misc.rb b/lib/scm/adapters/git/misc.rb
index ee596764cd998f17c05c2b3c061cda1f44cfd29b..a6b306179370a67dd1fd9e9cec75d3d4d692b245 100644 (file)
--- a/lib/scm/adapters/git/misc.rb
+++ b/lib/scm/adapters/git/misc.rb
@@ -60,5 +60,9 @@ module Scm::Adapters
                                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