start doing more stuff in normal mode

1 files changed, 8 insertions, 2 deletions

diff --git a/main.go b/main.go
index 4bde514..9b1320b 100644
--- a/main.go
+++ b/main.go
@@ -66,7 +66,8 @@ func main() {
 	// 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 {
-		doNormal()
+		// show what is still normal and what is not
+		doNormalStatus()
 	}
 
 	if me.sh.Cmd == "" {
@@ -117,7 +118,12 @@ func main() {
 	}
 
 	if argv.Normal != nil {
-		s, err = doNormal()
+		if me.forge.Config.Mode == forgepb.ForgeMode_NORMAL {
+			s, err = doNormalAll()
+		} else {
+			// attempt to switch into Normal mode
+			s, err = doNormalAttempt()
+		}
 	}
 
 	if argv.Merge != nil {