diff options
| -rw-r--r-- | repo.merge.go | 16 | ||||
| -rw-r--r-- | shell.go | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/repo.merge.go b/repo.merge.go index 41d3cc6..fe1e0ed 100644 --- a/repo.merge.go +++ b/repo.merge.go @@ -69,25 +69,25 @@ func (r *Repo) MergeToMaster() (*cmd.Status, error) { log.Info("MergeToMaster() merging from", devel, "into", master) cmd := []string{"git", "merge", devel} - result, err := r.RunQuiet(cmd) - if err != nil { + result := r.RunRealtimeVerbose(cmd) + if result.Error != nil { log.Log(WARN, "MergeToMaster() failed", r.GetFullPath()) - return result, err + return nil, result.Error } if r.GetReadOnly() { r.Reload() // rescan the repo // master branch is read only. you can not git push - return result, nil + return nil, nil } // it seems like we have write access. lets find out! cmd = []string{"git", "push"} - result, err = r.RunQuiet(cmd) - if err != nil { + result = r.RunRealtimeVerbose(cmd) + if result.Error != nil { log.Log(WARN, "GitPushToMaster() failed", r.GetFullPath()) - return result, err + return nil, result.Error } r.Reload() // rescan the repo - return result, nil + return nil, nil } @@ -43,7 +43,7 @@ func (repo *Repo) RunRealtime(cmd []string) cmd.Status { } func (repo *Repo) RunRealtimeVerbose(cmd []string) cmd.Status { - log.Log(NOW, "cd", repo.GetFullPath(), ";", cmd) + log.Log(NOW, "EXEC: cd", repo.GetFullPath(), ";", cmd) return shell.PathRunRealtime(repo.GetFullPath(), cmd) } |