summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Carr <[email protected]>2025-01-19 07:24:18 -0600
committerJeff Carr <[email protected]>2025-01-19 07:24:18 -0600
commit383edb2766e886846dc59cd62405a8032e183722 (patch)
treee11ca893c773730fbc8d96e765348bcfbdcc6607
parentf0f11794edf1a4a79c310ba66886572ce2f80827 (diff)
start ignoring missing user branch
-rw-r--r--doCheckout.go4
1 files changed, 4 insertions, 0 deletions
diff --git a/doCheckout.go b/doCheckout.go
index 03904e8..4c30d5a 100644
--- a/doCheckout.go
+++ b/doCheckout.go
@@ -173,6 +173,10 @@ func rillCheckoutMaster(repo *gitpb.Repo) error {
// repo is already on master
return nil
}
+ if repo.GetUserVersion() == "uerr" {
+ repo.CheckoutMaster()
+ return nil
+ }
if repo.GetUserVersion() != repo.GetDevelVersion() {
// don't switch branches if the user branch has uncommitted patches
return nil