error handling in git diffv0.0.147

1 files changed, 5 insertions, 2 deletions

diff --git a/reloadRepoState.go b/reloadRepoState.go
index 42482c4..923a50f 100644
--- a/reloadRepoState.go
+++ b/reloadRepoState.go
@@ -28,12 +28,15 @@ func (repo *Repo) setRepoState() {
 			repo.State = "no devel branch"
 			return
 		}
-		b1 := repo.CountDiffObjects(repo.GetMasterBranchName(), repo.GetDevelBranchName())
+		b1, err := repo.CountDiffObjects(repo.GetMasterBranchName(), repo.GetDevelBranchName())
+		if err != nil {
+			repo.State = "git log err"
+		}
 		if b1 == 0 {
 			repo.State = "merge to main"
 			// log.Info("master vs devel count is normal b1 == 0", b1)
 		} else {
-			repo.State = "DEVEL behind MASTER"
+			repo.State = log.Sprintf("DEVEL < MASTER by %d", b1)
 			// log.Info("master vs devel count b1 != 0", b1)
 			log.Infof("%s devel branch is behind master branch (missing %d commits)\n", repo.GetGoPath(), b1)
 		}