Fixup how to checkout from origin (#535)

canonical · Jul 8, 2024 · 07ce6fb · 07ce6fb
1 parent 8471e97
commit 07ce6fb
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/.github/workflows/fast-forward.yaml b/.github/workflows/fast-forward.yaml
@@ -40,12 +40,13 @@ jobs:
           ssh-key: ${{ secrets.DEPLOY_KEY_TO_UPDATE_STRICT_BRANCH }}
       - name: Checkout branches
         run: |
+          git fetch origin
           git checkout ${{ steps.branch.outputs.upstream }}
           git checkout ${{ steps.branch.outputs.target }}
       - name: Merge ${{ steps.branch.outputs.upstream }} into ${{ steps.branch.outputs.target }}
         run: |
           git checkout ${{ steps.branch.outputs.target }}
-          git merge origin/${{ steps.branch.outputs.upstream }} -m "Auto-merge ${{ steps.branch.outputs.upstream }}"
+          git merge ${{ steps.branch.outputs.upstream }} -m "Auto-merge ${{ steps.branch.outputs.upstream }}"
       - name: Create pull request
         uses: peter-evans/create-pull-request@v6
         with: