diff options
Diffstat (limited to 'doMerge.go')
| -rw-r--r-- | doMerge.go | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -38,7 +38,7 @@ func doMergeDevel() (*gitpb.Repos, error) { if repo.CheckoutDevel() { log.Info("checkout devel failed", repo.GetGoPath()) err = log.Errorf("checkout devel failed") - break + badExit(err) } // hash differences when merging user into devel branch out := repo.GetBranchDifferences(repo.GetDevelBranchName(), repo.GetUserBranchName()) @@ -50,7 +50,7 @@ func doMergeDevel() (*gitpb.Repos, error) { err = log.Errorf("merge from user failed") // log.Info(strings.Join(r.Stdout, "\n")) // log.Info(strings.Join(r.Stderr, "\n")) - break + badExit(err) } done.Append(repo) } @@ -73,7 +73,7 @@ func doMergeMaster() (*gitpb.Repos, error) { if repo.CheckoutMaster() { log.Info("checkout devel failed", repo.GetGoPath()) err = log.Errorf("checkout devel failed") - break + badExit(err) } if _, err := repo.MergeToMaster(); err != nil { @@ -81,7 +81,7 @@ func doMergeMaster() (*gitpb.Repos, error) { err = log.Errorf("merge from user failed") // log.Info(strings.Join(r.Stdout, "\n")) // log.Info(strings.Join(r.Stderr, "\n")) - break + badExit(err) } done.Append(repo) |