From db2d487a442a77898d464757fde419346c1b0a1f Mon Sep 17 00:00:00 2001
From: Tom Hu <tomhu1096@gmail.com>
Date: Thu, 5 Nov 2020 21:46:27 -0500
Subject: [PATCH] Kill off merge SHA because its not needed

---
 SHA1SUM   |  2 +-
 SHA256SUM |  2 +-
 SHA512SUM |  2 +-
 codecov   | 12 +-----------
 4 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/SHA1SUM b/SHA1SUM
index 6c7010fa..9251b5d1 100644
--- a/SHA1SUM
+++ b/SHA1SUM
@@ -1 +1 @@
-931a591a58e5bf2948db3b371815695154364862  codecov
+6ffa2cb90282d1f4eb54f597b5652e800c879a47  codecov
diff --git a/SHA256SUM b/SHA256SUM
index 95e73832..5e094559 100644
--- a/SHA256SUM
+++ b/SHA256SUM
@@ -1 +1 @@
-203a5127862148177abf7785689ba008de49036673ca76d49cf5f29d87d07bfb  codecov
+0e73f0fd398ba0c98571cefebf192726b1132d3475369d068c6776e4a33d41e0  codecov
diff --git a/SHA512SUM b/SHA512SUM
index 4610d730..901cb9fb 100644
--- a/SHA512SUM
+++ b/SHA512SUM
@@ -1 +1 @@
-032666cd4bb096dc1d8f1471f4d35a7690ad6e2128995202562301e5727b8d5ffd2959e992269f913ab7cdd75215b3be45755dfa9d2fdc93ca120bc28b6ee4e4  codecov
+c64134d84577e3d25338fce0c42f515aaa8639cdb541dc973ebb3d7cfeb7503484df4875e89c3dfc181e42a348fae61f5b6f4970bc230f4a472d1d0e1c61a978  codecov
diff --git a/codecov b/codecov
index 0683816f..dead336d 100755
--- a/codecov
+++ b/codecov
@@ -900,17 +900,7 @@ fi
 
 if [ "$commit_o" = "" ];
 then
-  # merge commit -> actual commit
-  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)
-  elif [ "$GIT_COMMIT" != "" ];
+  if [ "$GIT_COMMIT" != "" ];
   then
     commit="$GIT_COMMIT"
   elif [ "$commit" = "" ];