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

add doCheckout() back

This commit is contained in:
Jeff Carr 2025-09-04 09:58:36 -05:00
parent d2010b859a
commit 7697ab186a
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doPatch.go
View File

@ -56,6 +56,9 @@ func doPatch() error {
return nil return nil
} }
// always run dirty first
me.forge.CheckDirty()
// if no option is given to patch, list out the // if no option is given to patch, list out the
// repos that have patches ready in them // repos that have patches ready in them
found := findReposWithPatches() found := findReposWithPatches()

14
main.go
View File

@ -90,14 +90,12 @@ func main() {
okExit("") okExit("")
} }
/* if argv.Checkout != nil {
if argv.Checkout != nil { if err := doCheckout(); err != nil {
if err := doCheckout(); err != nil { badExit(err)
badExit(err)
}
okExit("")
} }
*/ okExit("")
}
if argv.Build != "" { if argv.Build != "" {
if err := doBuild(); err != nil { if err := doBuild(); err != nil {
@ -163,7 +161,7 @@ func main() {
} }
okExit("master merge ok") okExit("master merge ok")
} }
badExit(fmt.Errorf("merge what?")) badExit(fmt.Errorf("You must choose which branch to merge to (devel or master)"))
} }
if argv.Pull != nil { if argv.Pull != nil {