Fix merge commit detection: only for PRs

Fixes codecov#106.
blueyed · Dec 28, 2017 · f8b79fa · f8b79fa
1 parent bf42a52
commit f8b79fa
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/codecov b/codecov
@@ -760,7 +760,11 @@ fi
 if [ "$commit_o" = "" ];
 then
   # merge commit -> actual commit
-  mc=$(git show --no-patch --format="%P" 2>/dev/null || echo '')
+  mc=
+  if [ -n "$pr" ] && [ "$pr" != false ];
+  then
+    mc=$(git show --no-patch --format="%P" 2>/dev/null || echo '')
+  fi
   if [[ "$mc" =~ ^[a-z0-9]{40}[[:space:]][a-z0-9]{40}$ ]];
   then
     say "    Fixing merge commit SHA"