try to fix weird things with doClean()

argv.go

@@ -84,7 +84,7 @@ type DevCmd struct {
 }
 
 type CleanCmd struct {
-	Verify *EmptyCmd `arg:"subcommand:fix"        help:"try to fix problems"`
+	Fix  *EmptyCmd `arg:"subcommand:fix"              help:"try to fix problems"`
 	Repo string    `arg:"--repo"                      help:"which repo to look at"`
 }
 
@@ -151,7 +151,7 @@ type ConfigAddCmd struct {
 	Directory   bool   `arg:"--directory"                       help:"repo is a directory to match against"`
 	ReadOnly    bool   `arg:"--readonly"                        help:"repo is readonly"`
 	Writable    bool   `arg:"--writable"                        help:"repo is writable"`
-	Favorite    bool   `arg:"--favorite"     default:"false"    help:"forge will always go-clone or git clone this"`
+	Favorite    bool   `arg:"--favorite"                        help:"forge will always go-clone or git clone this" default:"false"`
 	Private     bool   `arg:"--private"      default:"false"    help:"repo can not be published"`
 	Interesting bool   `arg:"--interesting"  default:"false"    help:"something you decided was cool"`
 	DebName     string `arg:"--debname"                         help:"the name of the debian package (or rpm, etc)"`

doClean.go

@@ -4,9 +4,11 @@
 package main
 
 import (
+	"errors"
 	"fmt"
 	"path/filepath"
 
+	"go.wit.com/lib/fhelp"
 	"go.wit.com/lib/protobuf/forgepb"
 	"go.wit.com/lib/protobuf/gitpb"
 	"go.wit.com/log"
@@ -97,8 +99,17 @@ func doClean() error {
 
 		// try to delete user
 		if err := doRepoCleanUser(repo); err != nil {
+			if err == ErrorBranchUnique {
+				bname := repo.GetUserBranchName()
+				s := fmt.Sprintf("delete this odd user %bname branch %s?", bname, repo.FullPath)
+				if fhelp.QuestionUser(s) {
+					repo.RunVerbose([]string{"git", "branch", "-D", bname})
+					// repo.RunVerbose([]string{"git", "checkout", bname})
+				}
+			} else {
 				log.Info(repo.GetGoPath(), err)
 			}
+		}
 
 		// try to delete devel
 		doRepoCleanDevel(repo)
@@ -232,9 +243,14 @@ func doRepoCleanUser(repo *gitpb.Repo) error {
 		}
 	}
 
-	return fmt.Errorf("%s branch has unique commits", bruser)
+	if argv.Clean.Fix != nil {
+	}
+
+	return ErrorBranchUnique
 }
 
+var ErrorBranchUnique error = errors.New("branch has unique commits")
+
 // if you call this, there is no going back. no checks anymore. nothing
 // it deletes the 'devel' branch. git branch -D "devel". END OF STORY
 func justDeleteTheDevelBranchAlready(repo *gitpb.Repo) error {