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

cleaned up merge output to stdout

This commit is contained in:
Jeff Carr 2025-09-04 10:40:26 -05:00
parent 0517f01aa9
commit 5b3764c1b7
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
main.go
View File

@ -154,22 +154,22 @@ func main() {
start := time.Now()
repos, err := doMergeDevel()
dur := time.Since(start)
log.Printf("Merged %d devel branches in %s\n", repos.Len(), shell.FormatDuration(dur))
if err != nil {
badExit(err)
}
okExit("devel merge ok")
log.Printf("Merged %d devel branches in %s\n", repos.Len(), shell.FormatDuration(dur))
okExit("")
}
if argv.Merge.Master != nil {
start := time.Now()
repos, err := doMergeMaster()
dur := time.Since(start)
log.Printf("Merged %d master branches in %s\n", repos.Len(), shell.FormatDuration(dur))
if err != nil {
badExit(err)
}
okExit("master merge ok")
log.Printf("Merged %d master branches in %s\n", repos.Len(), shell.FormatDuration(dur))
okExit("")
}
badExit(fmt.Errorf("You must choose which branch to merge to (devel or master)"))
}