File tree Expand file tree Collapse file tree 1 file changed +6
-3
lines changed
Expand file tree Collapse file tree 1 file changed +6
-3
lines changed Original file line number Diff line number Diff line change @@ -137,7 +137,7 @@ jobs:
137137
138138 # Commit the changes
139139 git add vendor/sources.json
140- git commit -m "⬆️ Update dependencies ($env:LIST_UPDATED)"
140+ $commitResult = git commit -m "⬆️ Update dependencies ($env:LIST_UPDATED)"
141141
142142 # Push directly to master
143143 git push origin HEAD:master
@@ -159,8 +159,11 @@ jobs:
159159
160160 Write-Warning "Failed to auto-merge: $($_.Exception.Message)"
161161
162- # Reset changes so PR creation can work
163- git reset --hard HEAD~1
162+ # Reset only if a commit was made (check if HEAD moved)
163+ $headBeforeReset = git rev-parse HEAD
164+ if ($commitResult) {
165+ git reset --hard HEAD~1
166+ }
164167
165168 # Set flag to create PR instead
166169 echo "AUTO_MERGED=false" | Out-File -FilePath $env:GITHUB_ENV -Append -Encoding utf8
You can’t perform that action at this time.
0 commit comments