Skip to content

Commit

Permalink
+2
Browse files Browse the repository at this point in the history
  • Loading branch information
SunSerega committed Dec 15, 2024
1 parent 97a9407 commit 0e2ceca
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions .github/workflows/upstream force tracking.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ jobs:
if (-not $?) { throw "git remote add failed" }
git config --replace-all remote.upstream.fetch '+refs/pull/*:refs/remotes/upstream/pull/*'
if (-not $?) { throw "git config failed" }
git fetch upstream
git fetch upstream | Out-Null
if (-not $?) { throw "git fetch failed" }
$l_open_prs = @()
Expand Down Expand Up @@ -155,13 +155,14 @@ 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
git checkout -b $b_ft $b_r_upstream | Out-Null
if (-not $?) { throw "git checkout failed" }
git push --set-upstream origin $b_ft
if (-not $?) { throw "git push failed" }
continue
}
# Write-Host "Checkout force-tracking branch for PR $pr_num"
#TODO comment out
Write-Host "Checkout force-tracking branch for PR $pr_num"
git checkout --track $b_r_ft
if (-not $?) { throw "git checkout failed" }
Expand Down

0 comments on commit 0e2ceca

Please sign in to comment.