diff --git a/SHA1SUM b/SHA1SUM index 869fa2b2..14a04784 100644 --- a/SHA1SUM +++ b/SHA1SUM @@ -1 +1 @@ -a14f0d51132a420bcdd2f71200d403365bb51704 codecov +2e3dfbd41459016881435be334d7dbc5eaff01cc codecov diff --git a/SHA256SUM b/SHA256SUM index 5b631198..1ff42dc8 100644 --- a/SHA256SUM +++ b/SHA256SUM @@ -1 +1 @@ -7ae380d15a2c74efd12770cbcab66753038d5f433bcc770587b09182744b427e codecov +94ffd20eb6d59c8cdedd5280c45ec24ec17d9a819a1deb0997e86aa1cf93cf2b codecov diff --git a/SHA512SUM b/SHA512SUM index d4c68fad..97e90244 100644 --- a/SHA512SUM +++ b/SHA512SUM @@ -1 +1 @@ -68cc6dc98da1a2abd31cd9fbf17b474d91983766e905551e41ad3063f8220aaeeca719a34e2ad6a43d7f050575960fc5ec78d9202ed9a124070ab72ec5d5f308 codecov +93167a9834d3ba8d73c7247ce4e764de7ca7c5e9b7edefa1b3611d65aaa5eeff12543ffb44904bd09ed55a836a3ae8d42eb3bbcb38e9115f98176f5079e2382e codecov diff --git a/codecov b/codecov index afd8b4f1..937c16a7 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" = "" ];