jcarr
/
forge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wrong logic for checkout master

This commit is contained in:
Jeff Carr 2025-01-19 16:11:13 -06:00
parent 835c000aef
commit 16f0b731c5
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doCheckout.go
View File

@ -179,15 +179,15 @@ func rillCheckoutMaster(repo *gitpb.Repo) error {
repo.CheckoutMaster() repo.CheckoutMaster()
return nil return nil
} }
if repo.GetUserVersion() != repo.GetDevelVersion() {
// don't switch branches if the user branch has uncommitted patches
return nil
}
if me.forge.Config.IsReadOnly(repo.GetGoPath()) { if me.forge.Config.IsReadOnly(repo.GetGoPath()) {
// skip other checks for readonly repos // skip other checks for readonly repos
repo.CheckoutMaster() repo.CheckoutMaster()
return nil return nil
} }
if repo.GetUserVersion() != repo.GetDevelVersion() {
// don't switch branches if the user branch has uncommitted patches
return nil
}
if repo.GetDevelVersion() != repo.GetMasterVersion() { if repo.GetDevelVersion() != repo.GetMasterVersion() {
// don't switch braches if the devel branch does not match master (needs merge) // don't switch braches if the devel branch does not match master (needs merge)
return nil return nil