summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Carr <[email protected]>2025-01-19 16:11:13 -0600
committerJeff Carr <[email protected]>2025-01-19 16:11:13 -0600
commit16f0b731c508759f542acddd7e302a9440ea02e2 (patch)
tree005910c95b9a593a84fc079e9d53fb2f5a3afe31
parent835c000aefc6eb702bd326d77d08ac47abba675b (diff)
wrong logic for checkout masterv0.22.54
-rw-r--r--doCheckout.go8
1 files changed, 4 insertions, 4 deletions
diff --git a/doCheckout.go b/doCheckout.go
index 85e4fdb..2946500 100644
--- a/doCheckout.go
+++ b/doCheckout.go
@@ -179,15 +179,15 @@ func rillCheckoutMaster(repo *gitpb.Repo) error {
repo.CheckoutMaster()
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()) {
// skip other checks for readonly repos
repo.CheckoutMaster()
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() {
// don't switch braches if the devel branch does not match master (needs merge)
return nil