start checking the "normal" state every time

1 files changed, 15 insertions, 0 deletions

diff --git a/main.go b/main.go
index 8dbefc5..7aa68c1 100644
--- a/main.go
+++ b/main.go
@@ -99,6 +99,7 @@ func main() {
 	}
 
 	if argv.Checkout != nil {
+		me.forge.Config.Mode = forgepb.ForgeMode_MASTER
 		if err := doCheckout(); err != nil {
 			badExit(err)
 		}
@@ -120,6 +121,7 @@ func main() {
 	}
 
 	if argv.Clean != nil {
+		me.forge.Config.Mode = forgepb.ForgeMode_CLEAN
 		if argv.Clean.Repo != "" {
 			log.Info("only looking at repo:", argv.Clean.Repo)
 			okExit("")
@@ -140,11 +142,24 @@ func main() {
 	if argv.Normal != nil {
 		if doNormal() {
 			log.Infof("all %d repos are on your user branch. It is safe to write code now.\n", me.forge.Repos.Len())
+			if me.forge.Config.Mode != forgepb.ForgeMode_NORMAL {
+				log.Infof("Forge has set the mode to 'Normal'\n")
+				me.forge.Config.Mode = forgepb.ForgeMode_NORMAL
+				me.forge.ConfigSave()
+			}
 			okExit("")
 		}
 		okExit("")
 	}
 
+	// if you are in "normal" mode, always run normal every time to catch accidental errors
+	// for example, if you accidentally changed branches from your user branch
+	if me.forge.Config.Mode == forgepb.ForgeMode_NORMAL {
+		if doNormal() {
+			log.Infof("all %d repos are still normal\n", me.forge.Repos.Len())
+		}
+	}
+
 	if argv.Dirty != nil {
 		doDirty()
 		okExit("")