jcarr
/
gitpb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no need to warn anymore on nonexistent user branch

This commit is contained in:
Jeff Carr 2025-01-19 07:06:31 -06:00
parent 90e20c4ff0
commit d4cc68c07f
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
currentVersions.go
View File

@ -48,7 +48,7 @@ func (repo *Repo) setDevelVersion() {
if err == nil { if err == nil {
repo.DevelVersion = v repo.DevelVersion = v
} else { } else {
log.Log(WARN, "gitpb.GitDevelVersion() error:", err) // log.Log(WARN, "gitpb.GitDevelVersion() error:", err)
repo.DevelVersion = "deverr" repo.DevelVersion = "deverr"
} }
} }
@ -59,7 +59,7 @@ func (repo *Repo) setUserVersion() {
if err == nil { if err == nil {
repo.UserVersion = v repo.UserVersion = v
} else { } else {
log.Log(WARN, "gitpb.GitUserVersion() error:", err) // log.Log(WARN, "gitpb.GitUserVersion() error:", err)
repo.UserVersion = "uerr" repo.UserVersion = "uerr"
} }
} }

10
reloadRepoState.go
View File

@ -14,9 +14,13 @@ func (repo *Repo) setRepoState() {
repo.State = "dirty" repo.State = "dirty"
return return
} }
if repo.GetUserVersion() != repo.GetDevelVersion() { if repo.GetUserVersion() == "uerr" {
repo.State = "merge to devel" // user has not made user branches
return } else {
if repo.GetUserVersion() != repo.GetDevelVersion() {
repo.State = "merge to devel"
return
}
} }
if repo.GetDevelVersion() != repo.GetMasterVersion() { if repo.GetDevelVersion() != repo.GetMasterVersion() {
repo.State = "merge to main" repo.State = "merge to main"