File tree Expand file tree Collapse file tree 1 file changed +4
-4
lines changed Expand file tree Collapse file tree 1 file changed +4
-4
lines changed Original file line number Diff line number Diff line change @@ -209,9 +209,8 @@ jobs:
209
209
echo "Checking if PR can be auto-merged. Try: $i"
210
210
211
211
echo "Checking if update-branch-merged exists"
212
- git fetch --unshallow && git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*" || true
213
- git fetch origin
214
- if [[ $(git rev-parse origin/${{ env.UPDATE_BRANCH_MERGED }}) ]]; then
212
+ git fetch
213
+ if [[ $(git ls-remote --exit-code --heads origin ${{ env.UPDATE_BRANCH_MERGED }}) ]]; then
215
214
echo "Branch origin/${{ env.UPDATE_BRANCH_MERGED }} is missing"
216
215
exit 0
217
216
fi
@@ -273,7 +272,8 @@ jobs:
273
272
echo "Base branch is $base_branch"
274
273
275
274
echo "Fully fetching..."
276
- git fetch --unshallow && git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*" || true
275
+ git fetch --unshallow || true
276
+ git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
277
277
git fetch origin
278
278
279
279
if [[ $(git rev-parse origin/${{ env.UPDATE_BRANCH_MERGED }}) ]]; then
You can’t perform that action at this time.
0 commit comments