Skip to content

Commit 222cb42

Browse files
committed
fix
1 parent b5643d2 commit 222cb42

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

.github/actions/push-changes/action.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,6 @@ runs:
4040
git config --global user.name "${{ github.actor }}"
4141
git config --global user.email "${{ github.actor }}@users.noreply.github.com"
4242
git add -- ${{ inputs.working-directory }}
43-
git stash push -- ${{ inputs.working-directory }}
44-
git fetch origin
45-
git checkout -b ${{ inputs.target-branch }} origin/${{ inputs.target-branch }} --force
46-
git stash pop
4743
- name: Check for changes in ${{ inputs.working-directory }}
4844
shell: bash
4945
run: |
@@ -59,5 +55,9 @@ runs:
5955
if: ${{ steps.check-diff.outcome == 'failure' }}
6056
shell: bash
6157
run: |
58+
git stash push -- ${{ inputs.working-directory }}
59+
git fetch origin
60+
git checkout -b ${{ inputs.target-branch }} origin/${{ inputs.target-branch }} --force
61+
git stash pop
6262
git commit -m'${{ inputs.commit-message }}' -- ${{ inputs.working-directory }}
6363
git push

0 commit comments

Comments
 (0)