jcarr
/
forge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

skip merge if not on right branch

This commit is contained in:
Jeff Carr 2025-01-05 12:18:53 -06:00
parent ffd510e1d8
commit bc5994b84e
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
windowRepos.go
View File

@ -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