Fix handling of merge commits: only for PRs

blueyed · blueyed · commit e163777004d3 · 2017-12-28T15:11:03.000+01:00
Ref: codecov/codecov-bash#106
diff --git a/codecov/__init__.py b/codecov/__init__.py
@@ -527,27 +527,28 @@ def main(*argv, **kwargs):
     if codecov.build:
         query['build'] = codecov.build
 
+    if codecov.pr:
+        query['pr'] = codecov.pr
+
     if codecov.commit:
         query['commit'] = codecov.commit
 
-    else:
+    elif query['pr'] and query['pr'] != 'false':
         # Merge Commits
         # -------------
         res = try_to_run('git show --no-patch --format="%P"')
         if res:
             heads = res.split(' ')
             if len(heads) > 1:
                 query['commit'] = heads[0]
+                write('    Fixing merge commit SHA')
 
     if codecov.slug:
         query['slug'] = codecov.slug
 
     if codecov.branch:
         query['branch'] = codecov.branch
 
-    if codecov.pr:
-        query['pr'] = codecov.pr
-
     if codecov.tag:
         query['tag'] = codecov.tag
 
