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

more stuff

This commit is contained in:
Jeff Carr 2025-09-11 06:37:46 -05:00
parent 0785f0e97f
commit f44aef8926
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doMerge.go
View File

@ -38,7 +38,7 @@ func doMergeDevel() (*gitpb.Repos, error) {
if repo.CheckoutDevel() { if repo.CheckoutDevel() {
log.Info("checkout devel failed", repo.GetGoPath()) log.Info("checkout devel failed", repo.GetGoPath())
err = log.Errorf("checkout devel failed") err = log.Errorf("checkout devel failed")
break badExit(err)
} }
// hash differences when merging user into devel branch // hash differences when merging user into devel branch
out := repo.GetBranchDifferences(repo.GetDevelBranchName(), repo.GetUserBranchName()) out := repo.GetBranchDifferences(repo.GetDevelBranchName(), repo.GetUserBranchName())
@ -50,7 +50,7 @@ func doMergeDevel() (*gitpb.Repos, error) {
err = log.Errorf("merge from user failed") err = log.Errorf("merge from user failed")
// log.Info(strings.Join(r.Stdout, "\n")) // log.Info(strings.Join(r.Stdout, "\n"))
// log.Info(strings.Join(r.Stderr, "\n")) // log.Info(strings.Join(r.Stderr, "\n"))
break badExit(err)
} }
done.Append(repo) done.Append(repo)
} }
@ -73,7 +73,7 @@ func doMergeMaster() (*gitpb.Repos, error) {
if repo.CheckoutMaster() { if repo.CheckoutMaster() {
log.Info("checkout devel failed", repo.GetGoPath()) log.Info("checkout devel failed", repo.GetGoPath())
err = log.Errorf("checkout devel failed") err = log.Errorf("checkout devel failed")
break badExit(err)
} }
if _, err := repo.MergeToMaster(); err != nil { if _, err := repo.MergeToMaster(); err != nil {
@ -81,7 +81,7 @@ func doMergeMaster() (*gitpb.Repos, error) {
err = log.Errorf("merge from user failed") err = log.Errorf("merge from user failed")
// log.Info(strings.Join(r.Stdout, "\n")) // log.Info(strings.Join(r.Stdout, "\n"))
// log.Info(strings.Join(r.Stderr, "\n")) // log.Info(strings.Join(r.Stderr, "\n"))
break badExit(err)
} }
done.Append(repo) done.Append(repo)