diff options
Diffstat (limited to 'reloadRepoState.go')
| -rw-r--r-- | reloadRepoState.go | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/reloadRepoState.go b/reloadRepoState.go index a946e2d..7707c42 100644 --- a/reloadRepoState.go +++ b/reloadRepoState.go @@ -6,17 +6,6 @@ import ( "go.wit.com/log" ) -// count all objects only in branch1 -func (repo *Repo) countDiffObjects(branch1, branch2 string) int { - cmd := repo.ConstructGitDiffLog(branch1, branch2) - r, err := repo.RunVerboseOnError(cmd) - if err != nil { - return -1 - } - // log.Info("countDiffObjects()", cmd, len(r.Stdout), strings.Join(r.Stdout, " ")) - return len(r.Stdout) -} - func (repo *Repo) setRepoState() { if repo == nil { return @@ -44,7 +33,7 @@ func (repo *Repo) setRepoState() { repo.State = "devel not checked out" return } - b1 := repo.countDiffObjects(repo.GetMasterBranchName(), repo.GetDevelBranchName()) + b1 := repo.CountDiffObjects(repo.GetMasterBranchName(), repo.GetDevelBranchName()) if b1 == 0 { repo.State = "merge to main" // log.Info("master vs devel count is normal b1 == 0", b1) |