check for merge commit on all CI

stevepeak · stevepeak · commit 5413a86a8711 · 2016-05-11T10:44:55.000-04:00
diff --git a/codecov/__init__.py b/codecov/__init__.py
@@ -24,7 +24,7 @@
     pass
 
 
-version = VERSION = __version__ = '2.0.3'
+version = VERSION = __version__ = '2.0.4'
 
 COLOR = True
 
@@ -287,12 +287,6 @@ def main(*argv, **kwargs):
             if language == 'python' and os.getenv('TOXENV'):
                 include_env.add('TOXENV')
 
-            # Merge Commits
-            # -------------
-            res = try_to_run('git log -1 --pretty=%B')
-            if res and is_merge_commit.match(res.strip()):
-                query['commit'] = res.split(' ')[1]
-
         # --------
         # Codeship
         # --------
@@ -481,6 +475,13 @@ def main(*argv, **kwargs):
     if codecov.commit:
         query['commit'] = codecov.commit
 
+    else:
+        # Merge Commits
+        # -------------
+        res = try_to_run('git log -1 --pretty=%B')
+        if res and is_merge_commit.match(res.strip()):
+            query['commit'] = res.split(' ')[1]
+
     if codecov.slug:
         query['slug'] = codecov.slug
 
diff --git a/setup.py b/setup.py
@@ -2,7 +2,7 @@
 from setuptools import setup
 import sys
 
-version = '2.0.3'
+version = '2.0.4'
 classifiers = ["Development Status :: 5 - Production/Stable",
                "Environment :: Plugins",
                "Intended Audience :: Developers",
