diff options
Diffstat (limited to 'main.go')
| -rw-r--r-- | main.go | 26 |
1 files changed, 12 insertions, 14 deletions
@@ -140,6 +140,16 @@ func main() { okExit("") } + if argv.Help != nil { + doHelp() + okExit("") + } + + if argv.Dirty != nil { + doDirty() + okExit("") + } + if argv.Normal != nil { if argv.Normal.On != nil { if me.forge.Config.Mode == forgepb.ForgeMode_NORMAL { @@ -151,6 +161,7 @@ func main() { log.Info("normal mode on") okExit("") } + if argv.Normal.Off != nil { if me.forge.Config.Mode != forgepb.ForgeMode_NORMAL { log.Info("you were aleady not in the normal state") @@ -174,6 +185,7 @@ func main() { 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 { @@ -182,10 +194,6 @@ func main() { } } - if argv.Dirty != nil { - doDirty() - okExit("") - } if argv.Merge != nil { if argv.Merge.Devel != nil { @@ -235,16 +243,6 @@ func main() { okExit("") } - if argv.Help != nil { - doHelp() - okExit("") - } - - // todo: redo this logic using forgepb - if configSave { - me.forge.ConfigSave() - configSave = false - } // if the user doesn't want to open the GUI and // nothing else was specified to be done, |