From 3d6002b0553c1ec8f3dcfae35ef053c7cc01413a Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Wed, 14 Feb 2024 13:48:46 -0600 Subject: [PATCH] need correct logic here to read main branch name Signed-off-by: Jeff Carr --- git.go | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/git.go b/git.go index a8bed77..3c8efae 100644 --- a/git.go +++ b/git.go @@ -216,6 +216,14 @@ func (rs *RepoStatus) SetMainWorkingName(s string) { rs.mainWorkingName.SetValue(s) return } + s = "guimaster" + _, ok = rs.gitConfig.branches[s] + if ok { + log.Info("git branch", s, "seems to exist") + rs.mainWorkingName.SetValue(s) + return + } + s = "master" _, ok = rs.gitConfig.branches[s] if ok { @@ -232,7 +240,7 @@ func (rs *RepoStatus) SetMainWorkingName(s string) { return } - s = "notsure" + s = "TODO: read .git/config" log.Warn("git branch", s, "does not seem to exist. TODO: figure out the server default") for name, _ := range rs.gitConfig.branches { log.Warn("git branch found. use this?", name)