common patch submit codev0.22.152

1 files changed, 3 insertions, 19 deletions

diff --git a/doCommit.go b/doCommit.go
index 8ec6d45..3f6d340 100644
--- a/doCommit.go
+++ b/doCommit.go
@@ -11,7 +11,7 @@ import (
 	"go.wit.com/log"
 )
 
-func doCommit() {
+func doCommit() error {
 	if argv.All {
 		found := me.forge.CheckDirty()
 		var newpatches bool
@@ -26,7 +26,7 @@ func doCommit() {
 			okExit("")
 		}
 		if newpatches {
-			patchSubmitAndExit()
+			return doPatchSubmit()
 		}
 		okExit("")
 	}
@@ -69,23 +69,7 @@ func doCommit() {
 		badExit(err)
 	}
 
-	patchSubmitAndExit()
-}
-
-func patchSubmitAndExit() {
-	_, err := me.forge.SubmitDevelPatchSet("forge auto commit")
-	if err != nil {
-		// TRY different URL
-		me.forge.SetForgeURL("https://forge.grid.wit.com/")
-		log.Info("GOING TO TRY AGAIN", me.forge.GetForgeURL())
-	}
-
-	_, err = me.forge.SubmitDevelPatchSet("forge auto commit")
-	if err != nil {
-		badExit(err)
-	}
-
-	okExit("git commit ok. forge done")
+	return doPatchSubmit()
 }
 
 func doCommitRepo(repo *gitpb.Repo) error {