maybe works somewhat

2 files changed, 5 insertions, 12 deletions

diff --git a/clone.go b/clone.go
index 8225c58..63c9fc2 100644
--- a/clone.go
+++ b/clone.go
@@ -126,13 +126,11 @@ func (f *Forge) goClonePop(gopath string) (*gitpb.Repo, error) {
 	if gopath == "" {
 		return nil, nil
 	}
-	fullpath := filepath.Join(f.GetGoSrc(), gopath)
-	if pb := f.FindAnyPath(fullpath); pb != nil {
-		// repo already exists
-		return pb, nil
+	newpath, newdir := filepath.Split(gopath)
+	if newdir == "" {
+		// nothing to chop
+		return nil, nil
 	}
-
-	newpath, _ := filepath.Split(gopath)
 	if repo, _ := f.urlClone(newpath, "https://"+newpath); repo != nil {
 		return repo, nil
 	}
@@ -140,7 +138,7 @@ func (f *Forge) goClonePop(gopath string) (*gitpb.Repo, error) {
 	if repo, err := f.goClonePop(newpath); repo != nil {
 		return repo, err
 	}
-	return nil, fmt.Errorf("forge.goClonePop() failed %s", gopath)
+	return nil, fmt.Errorf("forge.goClonePop() did not work %s", gopath)
 }
 
 // clone a URL directly, also try cloning if 'go-import' is sent
diff --git a/repoNew.go b/repoNew.go
index 48caf4a..d234183 100644
--- a/repoNew.go
+++ b/repoNew.go
@@ -47,20 +47,15 @@ func (f *Forge) ValidGoVersion(ver string) (bool, error) {
 func (f *Forge) VerifyBranchNames(newr *gitpb.Repo) {
 	// log.Info("init worked for", newr.GoPath)
 
-	var mname string
 	if newr.GetMasterBranchName() == "" {
 		// try to guess what the 'master' branch is
 		if newr.IsBranch("guimaster") {
-			mname = "guimaster"
 			newr.SetMasterBranchName("guimaster")
 		} else if newr.IsBranch("master") {
-			mname = "master"
 			newr.SetMasterBranchName("master")
 		} else if newr.IsBranch("main") {
-			mname = "main"
 			newr.SetMasterBranchName("main")
 		} else {
-			mname = "master"
 			// todo, figure out the name from git
 			newr.SetMasterBranchName("master")
 			if newr.CheckoutMaster() {