1 files changed, 6 insertions, 18 deletions
diff --git a/new.go b/new.go
index 289966e..79df202 100644
--- a/new.go
+++ b/new.go
@@ -2,7 +2,6 @@ package repostatus
 
 import (
 	"os"
-	"os/user"
 	"path/filepath"
 	"strings"
 
@@ -114,24 +113,13 @@ func NewRepoStatusWindow(path string) *RepoStatus {
 	if strings.HasPrefix(path, "git.wit.org") {
 		rs.readOnly.SetValue("false")
 	}
-	rs.setMainWorkingName("master")
 
-	usr, _ := user.Current()
-	uname := usr.Username
-	if rs.TagExists(uname) {
-		rs.setUserWorkingName(uname)
-	} else {
-		rs.setUserWorkingName("")
-	}
-
-	if rs.TagExists("guidevel") {
-		rs.setDevelWorkingName("guidevel")
-	} else if rs.TagExists("devel") {
-		rs.setDevelWorkingName("devel")
-	} else {
-		log.Log(WARN, "tag devel does not exist")
-		rs.setDevelWorkingName("")
-	}
+	// tries 'master', 'main', etc.
+	rs.guessMainWorkingName()
+	// tries 'devel', etc
+	rs.guessDevelWorkingName()
+	// sets this to os.Username
+	rs.setUserWorkingName()
 
 	windowMap[path] = rs
 	return rs