diff options
| author | Jeff Carr <[email protected]> | 2025-01-19 07:06:31 -0600 |
|---|---|---|
| committer | Jeff Carr <[email protected]> | 2025-01-19 07:06:31 -0600 |
| commit | d4cc68c07f2309ddefc904215d79e21fd8eb034a (patch) | |
| tree | 0e84ac348eeb44d31eca176def65e584f1e634ff /reloadRepoState.go | |
| parent | 90e20c4ff0da0488b602c4079368cf2aafc7ad05 (diff) | |
no need to warn anymore on nonexistent user branchv0.0.60
Diffstat (limited to 'reloadRepoState.go')
| -rw-r--r-- | reloadRepoState.go | 10 |
1 files changed, 7 insertions, 3 deletions
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" |
