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

need to move branch repair to the gui

This commit is contained in:
Jeff Carr 2025-01-29 01:12:44 -06:00
parent 24988d440c
commit 41203c36e8
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doCommit.go
View File

@ -11,7 +11,7 @@ func doCommit() {
pwd, _ := os.Getwd() pwd, _ := os.Getwd()
repo := me.forge.Repos.FindByFullPath(pwd) repo := me.forge.Repos.FindByFullPath(pwd)
if repo == nil { if repo == nil {
log.Info("what branch are you on?: todo: examine this") log.Info("todo: forge doesn't know how to work here yet")
okExit("") okExit("")
} }
if repo.GetCurrentBranchName() != repo.GetUserBranchName() { if repo.GetCurrentBranchName() != repo.GetUserBranchName() {

2
doGui.go
View File

@ -108,7 +108,7 @@ func globalBuildOptions(vbox *gui.Node) {
// this lets you select your user branch, but, when you are happy // this lets you select your user branch, but, when you are happy
// you can merge everything into the devel branch and make sure it actually // you can merge everything into the devel branch and make sure it actually
// works. Then, when that is good, merge and version everything in master // works. Then, when that is good, merge and version everything in master
me.setBranchB = grid.NewButton("set current branch to:", func() { me.setBranchB = grid.NewButton("set current branches to:", func() {
targetName := me.newBranch.String() targetName := me.newBranch.String()
log.Warn("setting all branches to", targetName) log.Warn("setting all branches to", targetName)
if targetName == "devel" { if targetName == "devel" {