common patch submit codev0.22.152

1 files changed, 16 insertions, 11 deletions

diff --git a/doPatch.go b/doPatch.go
index 36357b3..c1e301b 100644
--- a/doPatch.go
+++ b/doPatch.go
@@ -31,31 +31,36 @@ func isPatchingSafe() bool {
 	if me.forge.Config.Mode == forgepb.ForgeMode_NORMAL {
 		return true
 	}
-	log.Info("forge requres a 'normal' state to work with patches")
-	log.Info("you must run:")
+	log.Info("This patch command is not safe to run now")
+	log.Info("you must reset the state of your git repositories. Run:")
 	log.Info("")
 	log.Info("forge normal")
 	log.Info("")
 	return false
 }
 
+// submit's current working patches
+func doPatchSubmit() error {
+	pset, err := me.forge.MakeDevelPatchSet("testing")
+	if err != nil {
+		return err
+	}
+	_, _, err = pset.Patches.HttpPostVerbose(myServer(), "new")
+	return err
+}
+
 func doPatch() error {
 	if argv.Patch.Repos != nil {
 		dumpDirtyRepos()
 		return nil
 	}
 
-	if !isPatchingSafe() {
-		return log.Errorf("not safe to work on patches")
+	if argv.Patch.Submit != nil {
+		return doPatchSubmit()
 	}
 
-	if argv.Patch.Submit != nil {
-		pset, err := me.forge.MakeDevelPatchSet("testing")
-		if err != nil {
-			return err
-		}
-		pset.Patches.HttpPostVerbose(myServer(), "new")
-		return nil
+	if !isPatchingSafe() {
+		return log.Errorf("not safe to work on patches")
 	}
 
 	if argv.Patch.Get != nil {