Do not fix merge SHA if commit override (#414)

thomasrockhu · web-flow · commit 2b87acedd23e · 2021-03-09T10:07:21.000-05:00
* Test upload

* Put the check in the right place

* Fix tests actually
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -5,6 +5,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
+      with:
+        fetch-depth: 2
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
diff --git a/SHA1SUM b/SHA1SUM
@@ -1 +1 @@
-20189261363b53e39287a46aa07352853646f17b  codecov
+6a79f314107e625c36c6273fa2435c0627e7e858  codecov
diff --git a/SHA256SUM b/SHA256SUM
@@ -1 +1 @@
-54cce90506cc2f675a2dbd53cb6be3be0dc575ea74d873b8aa7c9d5fdaeb03e2  codecov
+f6a1db3aeab166550258575335932cd4607b725007fb45eabb473bf6407152c7  codecov
diff --git a/SHA512SUM b/SHA512SUM
@@ -1 +1 @@
-b26e17183e97ef5c076f7788c3b3462fd7263b2e53bfffde5f6205dc596fdfe943ee83e04f6f04a060a74ead24ab59fe24aac8bec54cf1aa68af15b57e069795  codecov
+fa8316fcf6448363042168523c39984baaf9eff4dcbb49e7268e1da467e597c77ee12f66f0774ab7c131400e4ab55c23cea213702de1e63b88c55f559b23d4ab  codecov
diff --git a/codecov b/codecov
@@ -877,7 +877,7 @@ then
 
   # actions/checkout runs in detached HEAD
   mc=
-  if [ -n "$pr" ] && [ "$pr" != false ];
+  if [ -n "$pr" ] && [ "$pr" != false ] && [ "$commit_o" == "" ];
   then
     mc=$(git show --no-patch --format="%P" 2>/dev/null || echo "")
 

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-54cce90506cc2f675a2dbd53cb6be3be0dc575ea74d873b8aa7c9d5fdaeb03e2 codecov`
	`1`	`+f6a1db3aeab166550258575335932cd4607b725007fb45eabb473bf6407152c7 codecov`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-b26e17183e97ef5c076f7788c3b3462fd7263b2e53bfffde5f6205dc596fdfe943ee83e04f6f04a060a74ead24ab59fe24aac8bec54cf1aa68af15b57e069795 codecov`
	`1`	`+fa8316fcf6448363042168523c39984baaf9eff4dcbb49e7268e1da467e597c77ee12f66f0774ab7c131400e4ab55c23cea213702de1e63b88c55f559b23d4ab codecov`