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

minor fix

This commit is contained in:
Jeff Carr 2025-09-06 19:26:49 -05:00
parent d99eb81385
commit a6c0edb89d
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
doMerge.go
View File

@ -4,8 +4,6 @@
package main
import (
"fmt"
"go.wit.com/lib/protobuf/gitpb"
"go.wit.com/log"
)
@ -19,10 +17,10 @@ func doMergeDevel() (*gitpb.Repos, error) {
log.Info("repo is dirty", repo.GetGoPath())
continue
}
log.Infof("%s starting git merge", repo.FullPath)
log.Infof("%s starting git merge\n", repo.FullPath)
if repo.CheckoutDevel() {
log.Info("checkout devel failed", repo.GetGoPath())
err = fmt.Errorf("checkout devel failed")
err = log.Errorf("checkout devel failed")
break
}
// hash differences when merging user into devel branch
@ -32,7 +30,7 @@ func doMergeDevel() (*gitpb.Repos, error) {
}
if _, err := repo.MergeToDevel(); err != nil {
log.Info("merge from user failed", repo.GetGoPath(), err)
err = fmt.Errorf("merge from user failed")
err = log.Errorf("merge from user failed")
// log.Info(strings.Join(r.Stdout, "\n"))
// log.Info(strings.Join(r.Stderr, "\n"))
break
@ -56,13 +54,13 @@ func doMergeMaster() (*gitpb.Repos, error) {
log.Info("Starting merge on", repo.GetGoPath())
if repo.CheckoutMaster() {
log.Info("checkout devel failed", repo.GetGoPath())
err = fmt.Errorf("checkout devel failed")
err = log.Errorf("checkout devel failed")
break
}
if _, err := repo.MergeToMaster(); err != nil {
log.Info("merge from user failed", repo.GetGoPath(), err)
err = fmt.Errorf("merge from user failed")
err = log.Errorf("merge from user failed")
// log.Info(strings.Join(r.Stdout, "\n"))
// log.Info(strings.Join(r.Stderr, "\n"))
break

2
doNormal.go
View File

@ -62,7 +62,7 @@ func checkNormalRepoState(repo *gitpb.Repo) error {
if repo.GetCurrentBranchName() != repo.GetUserBranchName() {
configSave = true
log.Info("crapnuts")
log.Info("changing to user branch", repo.FullPath)
repo.CheckoutUser()
repo.Reload()
return log.Errorf("now on user branch")