diff --git a/currentVersions.go b/currentVersions.go index 6eeee18..db2ebfa 100644 --- a/currentVersions.go +++ b/currentVersions.go @@ -48,7 +48,7 @@ func (repo *Repo) setDevelVersion() { if err == nil { repo.DevelVersion = v } else { - log.Log(WARN, "gitpb.GitDevelVersion() error:", err) + // log.Log(WARN, "gitpb.GitDevelVersion() error:", err) repo.DevelVersion = "deverr" } } @@ -59,7 +59,7 @@ func (repo *Repo) setUserVersion() { if err == nil { repo.UserVersion = v } else { - log.Log(WARN, "gitpb.GitUserVersion() error:", err) + // log.Log(WARN, "gitpb.GitUserVersion() error:", err) repo.UserVersion = "uerr" } } diff --git a/reloadRepoState.go b/reloadRepoState.go index 322c5b0..b4928c7 100644 --- a/reloadRepoState.go +++ b/reloadRepoState.go @@ -14,9 +14,13 @@ func (repo *Repo) setRepoState() { repo.State = "dirty" return } - if repo.GetUserVersion() != repo.GetDevelVersion() { - repo.State = "merge to devel" - return + if repo.GetUserVersion() == "uerr" { + // user has not made user branches + } else { + if repo.GetUserVersion() != repo.GetDevelVersion() { + repo.State = "merge to devel" + return + } } if repo.GetDevelVersion() != repo.GetMasterVersion() { repo.State = "merge to main"