diff options
| -rw-r--r-- | repo.merge.go | 20 | ||||
| -rw-r--r-- | shell.go | 2 |
2 files changed, 11 insertions, 11 deletions
diff --git a/repo.merge.go b/repo.merge.go index 20bc5b0..41d3cc6 100644 --- a/repo.merge.go +++ b/repo.merge.go @@ -18,35 +18,35 @@ func (r *Repo) MergeToDevel() (*cmd.Status, error) { devel := r.GetDevelBranchName() user := r.GetUserBranchName() - log.Info("MergeToDevel() merging from", user, "into", devel) + log.Info(r.FullPath, "MergeToDevel() merging from", user, "into", devel) cmd := []string{"git", "merge", user} - result, err := r.RunQuiet(cmd) - if err != nil { + result := r.RunRealtimeVerbose(cmd) + if result.Error != nil { log.Log(WARN, "MergeToDevel() failed", r.GetFullPath()) - return result, err + return nil, result.Error } if !r.IsBranchRemote(devel) { r.Reload() // rescan the repo // devel branch is not remote. do not try 'git push' - return result, nil + return nil, nil } if r.GetReadOnly() { r.Reload() // rescan the repo // devel 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, "GitPushToDevel() failed", r.GetFullPath()) - return result, err + return nil, result.Error } r.Reload() // rescan the repo - return result, nil + return nil, nil } func (r *Repo) MergeToMaster() (*cmd.Status, error) { @@ -43,7 +43,7 @@ func (repo *Repo) RunRealtime(cmd []string) cmd.Status { } func (repo *Repo) RunRealtimeVerbose(cmd []string) cmd.Status { - log.Log(NOW, "Run:", repo.GetFullPath(), cmd) + log.Log(NOW, "cd", repo.GetFullPath(), ";", cmd) return shell.PathRunRealtime(repo.GetFullPath(), cmd) } |