From b90013320cd9d7d5c131319a48a92c39fbd6540c Mon Sep 17 00:00:00 2001
From: Tom Hu <tomhu1096@gmail.com>
Date: Sun, 11 Oct 2020 15:41:01 -0400
Subject: [PATCH 1/2] Fix PR value based on CircleCI vars

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

diff --git a/SHA1SUM b/SHA1SUM
index 7fac8992..0143d688 100644
--- a/SHA1SUM
+++ b/SHA1SUM
@@ -1 +1 @@
-e52cca356350b6c0e69834982d611b7d28cc7e5a  codecov
+217ed61b082cf29ea47c591b41a5f622ffed13bc  codecov
diff --git a/SHA256SUM b/SHA256SUM
index 014f121c..b4887b92 100644
--- a/SHA256SUM
+++ b/SHA256SUM
@@ -1 +1 @@
-b3de3f7baba018dcf707f548956a6794cbc900bd4ec98126d73219b29568cf2a  codecov
+9253838a7d203a3027d8f290b18d0c215d6a4d1336f349c89b8e710a04b6796d  codecov
diff --git a/SHA512SUM b/SHA512SUM
index 6b79f2c8..956e23a7 100644
--- a/SHA512SUM
+++ b/SHA512SUM
@@ -1 +1 @@
-08a6fcb46b6e98084b81259d97941d160d0e7656ac45596c18d6c0280f25318758d91664e194e32df3460e48e8aaa802ad892a0c91390fbeda32eea085e78514  codecov
+2e2c744abab652ae01eff5d8b3274029e6ba989ee8e1a68c6d076b47eec28a3b998908bc109564f9955da7adc4befce36fa552c01bda8e888d07e408ae760c8a  codecov
diff --git a/codecov b/codecov
index a33daf9a..1fcc222f 100755
--- a/codecov
+++ b/codecov
@@ -617,7 +617,7 @@ then
     # owner/repo.git
     slug="${slug%%.git}"
   fi
-  pr="$CIRCLE_PR_NUMBER"
+  pr="${CIRCLE_PULL_REQUEST##*/}"
   commit="$CIRCLE_SHA1"
   search_in="$search_in $CIRCLE_ARTIFACTS $CIRCLE_TEST_REPORTS"
 

From dd74693e205789621e41862a5202b9268d2931e1 Mon Sep 17 00:00:00 2001
From: Tom Hu <tomhu1096@gmail.com>
Date: Wed, 14 Oct 2020 17:30:01 -0400
Subject: [PATCH 2/2] wip

---
 codecov | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/codecov b/codecov
index 1fcc222f..cce4f23b 100755
--- a/codecov
+++ b/codecov
@@ -908,8 +908,9 @@ then
   fi
   if [[ "$mc" =~ ^[a-z0-9]{40}[[:space:]][a-z0-9]{40}$ ]];
   then
-    say "    Fixing merge commit SHA"
-    commit=$(echo "$mc" | cut -d' ' -f2)
+    mergecommit=${echo "$mc" | cut -d' ' -f2}
+    say "    Fixing merge commit SHA from $commit to $mergecommit"
+    commit=$mergecommit
   elif [ "$GIT_COMMIT" != "" ];
   then
     commit="$GIT_COMMIT"