diff --git a/.github/workflows/upstream force tracking.yaml b/.github/workflows/upstream force tracking.yaml index d58efff8..1e4e6a59 100644 --- a/.github/workflows/upstream force tracking.yaml +++ b/.github/workflows/upstream force tracking.yaml @@ -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 | Out-Null + git fetch upstream 2>&1 | Out-Null if (-not $?) { throw "git fetch failed" } $l_open_prs = @() @@ -143,9 +143,8 @@ jobs: Write-Host "Delete force-tracking branch for PR $pr_num" $l_legacy_ft += "force-tracking/$pr_num" } - #TODO uncomment - # git push origin --delete $l_legacy_ft - # if (-not $?) { throw "git push failed" } + git push origin --delete $l_legacy_ft + if (-not $?) { throw "git push failed" } foreach ($pr_num in $l_open_prs) { $b_upstream = "pull/$pr_num/head" @@ -163,6 +162,7 @@ jobs: } #TODO comment out Write-Host "Checkout force-tracking branch for PR $pr_num" + Write-Host git checkout --track $b_r_ft git checkout --track $b_r_ft if (-not $?) { throw "git checkout failed" }