detect more devel branch problems

2 files changed, 18 insertions, 0 deletions

diff --git a/branches.go b/branches.go
index e6d0570..192e4e3 100644
--- a/branches.go
+++ b/branches.go
@@ -40,6 +40,10 @@ func (repo *Repo) ExistsUserBranch() bool {
 		// todo: actually use .git/config
 		return true
 	}
+	if repo.Exists(filepath.Join(".git/refs/remote/origin", branchname)) {
+		// todo: actually use .git/config
+		return true
+	}
 	return false
 }
 
@@ -53,6 +57,10 @@ func (repo *Repo) ExistsDevelBranch() bool {
 		// todo: actually use .git/config
 		return true
 	}
+	if repo.Exists(filepath.Join(".git/refs/remote/origin", branchname)) {
+		// todo: actually use .git/config
+		return true
+	}
 	return false
 }
 
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"