From 40d369e6e94ffeaba7f4ebf60346545a3b51e603 Mon Sep 17 00:00:00 2001 From: Sun Serega Date: Sun, 15 Dec 2024 17:04:46 +0100 Subject: [PATCH] +6 --- .github/workflows/upstream force tracking.yaml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/upstream force tracking.yaml b/.github/workflows/upstream force tracking.yaml index 67bf2a46..34171f44 100644 --- a/.github/workflows/upstream force tracking.yaml +++ b/.github/workflows/upstream force tracking.yaml @@ -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"