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

verbose merge

This commit is contained in:
Jeff Carr 2025-09-05 13:24:00 -05:00
parent 5f882d1388
commit 722ebeeef8
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
repo.merge.go
View File

@ -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
}

2
shell.go
View File

@ -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)
}