diff options
Diffstat (limited to 'windowRepos.go')
| -rw-r--r-- | windowRepos.go | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/windowRepos.go b/windowRepos.go index a4fcdeb..824e222 100644 --- a/windowRepos.go +++ b/windowRepos.go @@ -145,6 +145,10 @@ func (r *repoWindow) mergeAllDevelToMain() bool { log.Info("skipping dirty", repo.GetFullPath()) continue } + if repo.GetCurrentBranchName() != repo.GetDevelBranchName() { + log.Info("not on devel branch", repo.GetFullPath()) + continue + } if result, err := repo.MergeDevelToMaster(); err == nil { log.Warn("THINGS SEEM OK", repo.GetFullPath()) continue @@ -170,13 +174,17 @@ func (r *repoWindow) mergeAllUserToDevel() bool { for loop.Scan() { repo := loop.Next() if me.forge.Config.IsReadOnly(repo.GetGoPath()) { - log.Info("skipping readonly", repo.GetFullPath()) + // log.Info("skipping readonly", repo.GetFullPath()) continue } if repo.IsDirty() { log.Info("skipping dirty", repo.GetFullPath()) continue } + if repo.GetCurrentBranchName() != repo.GetUserBranchName() { + log.Info("not on user branch", repo.GetFullPath()) + continue + } if result, err := repo.MergeUserToDevel(); err == nil { log.Warn("THINGS SEEM OK", repo.GetFullPath()) continue |