diff options
| -rw-r--r-- | doMerge.go | 12 | ||||
| -rw-r--r-- | doNormal.go | 2 |
2 files changed, 6 insertions, 8 deletions
@@ -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 diff --git a/doNormal.go b/doNormal.go index 12b0eaf..25d766f 100644 --- a/doNormal.go +++ b/doNormal.go @@ -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") |