Commit 4ca4545

committed

Fix ReleaseTools to checkout, create, or reset release branch

The option was supposed to be `-B` not `-b`, the former will forcibly reset the local branch instead of failing if it already exists.

1 parent 25e09e4 commit 4ca4545Copy full SHA for 4ca4545

File tree

-3

lines changed

-3

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -180,8 +180,8 @@ function Update-Branch {`
`180`	`180`	`Use-Repository -RepositoryName $RepositoryName -Script {`
`181`	`181`	`$Branch = git branch --show-current`
`182`	`182`	`if ($Branch -ne "release") {`
`183`		`- if ($PSCmdlet.ShouldProcess("release", "git checkout -b")) {`
`184`		`- git checkout -b "release"`
	`183`	`+ if ($PSCmdlet.ShouldProcess("release", "git checkout -B")) {`
	`184`	`+ git checkout -B "release"`
`185`	`185`	`}`
`186`	`186`	`}`
`187`	`187`	`}`
`@@ -389,7 +389,7 @@ function New-ReleasePR {`
`389`	`389`	`Use-Repository -RepositoryName $RepositoryName -Script {`
`390`	`390`	`if ($PSCmdlet.ShouldProcess("$RepositoryName/release", "git push")) {`
`391`	`391`	`Write-Host "Pushing release branch..."`
`392`		`- git push --force-with-lease origin release`
	`392`	`+ git push --set-upstream--force-with-lease origin release`
`393`	`393`	`}`
`394`	`394`	`}`
`395`	`395`

Comments

(0)