Skip to content

Commit

Permalink
+6
Browse files Browse the repository at this point in the history
  • Loading branch information
SunSerega committed Dec 15, 2024
1 parent a43c558 commit 40d369e
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions .github/workflows/upstream force tracking.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -156,22 +156,20 @@ jobs:
if ($pr_num -notin $l_force_tracking) {
Write-Host "Create force-tracking branch for PR $pr_num"
git checkout -b $b_ft $b_r_upstream | Out-Null
git checkout -b $b_ft $b_r_upstream 2>&1 | Out-Null
if (-not $?) { throw "git checkout failed" }
git push --set-upstream origin $b_ft
if (-not $?) { throw "git push failed" }
continue
}
#TODO comment-out
Write-Host "Checkout force-tracking branch for PR $pr_num"
git checkout --track $b_r_ft
# Write-Host "Checkout force-tracking branch for PR $pr_num"
git checkout --track $b_r_ft 2>&1 | Out-Null
if (-not $?) { throw "git checkout failed" }
$upstream_fwd_c = git rev-list --count "HEAD..$b_r_upstream"
if (-not $?) { throw "git rev-list failed" }
if ($upstream_fwd_c -eq 0) {
#TODO comment-out
Write-Host "No upstream changes for PR $pr_num"
# Write-Host "No upstream changes for PR $pr_num"
continue
}
Write-Host "Upstream changes for PR ${pr_num}: $upstream_fwd_c new commits"
Expand Down

0 comments on commit 40d369e

Please sign in to comment.