Merge pull request #373 from codecov/remove-merge-fix

Kill off merge SHA because its not needed

SHA1SUM

@@ -1 +1 @@
-a14f0d51132a420bcdd2f71200d403365bb51704  codecov
+2e3dfbd41459016881435be334d7dbc5eaff01cc  codecov

SHA256SUM

@@ -1 +1 @@
-7ae380d15a2c74efd12770cbcab66753038d5f433bcc770587b09182744b427e  codecov
+94ffd20eb6d59c8cdedd5280c45ec24ec17d9a819a1deb0997e86aa1cf93cf2b  codecov

SHA512SUM

@@ -1 +1 @@
-68cc6dc98da1a2abd31cd9fbf17b474d91983766e905551e41ad3063f8220aaeeca719a34e2ad6a43d7f050575960fc5ec78d9202ed9a124070ab72ec5d5f308  codecov
+93167a9834d3ba8d73c7247ce4e764de7ca7c5e9b7edefa1b3611d65aaa5eeff12543ffb44904bd09ed55a836a3ae8d42eb3bbcb38e9115f98176f5079e2382e  codecov

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" = "" ];