Merge pull request #380 from codecov/actions-merge

Add merge commit logic for GitHub Actions

SHA1SUM

@@ -1 +1 @@
-25046f4ad49332b13373c9cd743df89da79ea007  codecov
+8999e6514caa476cbd4f6e2378c61b52faaf05b0  codecov

SHA256SUM

@@ -1 +1 @@
-fea4688d635341e3948f46444cfa65ae6c361abedd8faa57907a30cf63a36195  codecov
+82ab2f05265e48addf3ba4502a7cbeaf9111804521cdd166301ee23fb5929f78  codecov

SHA512SUM

@@ -1 +1 @@
-ac06301d51e5ef8d42c9bfcee3412e1819695d7de0555056ed088617d7e04c08e9756a4a16fd209b4b23254a5b27b9162f028dace617d6cc7c869f494180f7c5  codecov
+7d0f38280d7783cc1b61b5e137621989d1f2cbcde53f778ac52780959a9f51f6ac77e5591386001797669970e36f34b5fe02096acc6cefa3b26ebddc8280470c  codecov

codecov

@@ -820,6 +820,18 @@ then
   build="${GITHUB_RUN_ID}"
   build_url=$(urlencode "http://github.com/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}")
 
+  # actions/checkout runs in detached HEAD
+  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"
+    commit=$(echo "$mc" | cut -d' ' -f2)
+  fi
+
 elif [ "$SYSTEM_TEAMFOUNDATIONSERVERURI" != "" ];
 then
   say "$e==>$x Azure Pipelines detected."