diff --git a/.github/workflows/tapioca.yml b/.github/workflows/tapioca.yml
index f883c94c53..9685d0b931 100644
--- a/.github/workflows/tapioca.yml
+++ b/.github/workflows/tapioca.yml
@@ -39,11 +39,12 @@ jobs:
           bundle exec tapioca sync --exclude json
           bundle exec srb rbi hidden-definitions
 
+          git fetch origin master
+          git reset --hard origin/master
           git checkout -B tapioca-update
-          git reset origin/master
           git add sorbet
-          if ! git --no-patch --exit-code HEAD -- sorbet; then
-            if ! git ls-remote --exit-code --heads origin tapioca-update; then
+          if ! git diff --no-patch --exit-code HEAD -- sorbet; then
+            if ! git ls-remote --exit-code --heads origin tapioca-update >/dev/null; then
               git commit -m "sorbet: update RBI files using Tapioca." -m "Autogenerated by [a scheduled GitHub Action](https://github.com/Homebrew/brew/blob/master/.github/workflows/tapioca.yml)."
               echo "::set-output name=committed::true"
             fi
@@ -58,8 +59,6 @@ jobs:
 
       - name: Open a pull request
         if: steps.update.outputs.committed == 'true'
-        run: |
-          cd "$GITHUB_WORKSPACE/Library/Homebrew"
-          hub pull-request --no-edit
+        run: hub pull-request --no-edit
         env:
           GITHUB_TOKEN: ${{ secrets.HOMEBREW_GITHUB_API_TOKEN }}