detect more devel branch problems

1 files changed, 10 insertions, 0 deletions

diff --git a/reloadRepoState.go b/reloadRepoState.go
index b6cb20a..a946e2d 100644
--- a/reloadRepoState.go
+++ b/reloadRepoState.go
@@ -34,6 +34,16 @@ func (repo *Repo) setRepoState() {
 		}
 	}
 	if repo.GetDevelVersion() != repo.GetMasterVersion() {
+		if !repo.ExistsDevelBranch() {
+			// there is no devel branch. you are safe to proceed
+			repo.State = "no devel branch"
+			return
+		}
+		if !repo.IsLocalBranch(repo.GetDevelBranchName()) {
+			// the remote devel branch exists but is not checked out
+			repo.State = "devel not checked out"
+			return
+		}
 		b1 := repo.countDiffObjects(repo.GetMasterBranchName(), repo.GetDevelBranchName())
 		if b1 == 0 {
 			repo.State = "merge to main"