summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Carr <[email protected]>2025-01-29 01:12:44 -0600
committerJeff Carr <[email protected]>2025-01-29 12:18:16 -0600
commit41203c36e858a5f1b1a0e051b0d1ea8dd3737245 (patch)
tree72056f5718f2f35b0e54aab34b8f18c1f709ecfd
parent24988d440cf7a7919c964447b8997390ac28da0b (diff)
need to move branch repair to the gui
-rw-r--r--doCommit.go2
-rw-r--r--doGui.go2
2 files changed, 2 insertions, 2 deletions
diff --git a/doCommit.go b/doCommit.go
index ae8af1a..7ef6a99 100644
--- a/doCommit.go
+++ b/doCommit.go
@@ -11,7 +11,7 @@ func doCommit() {
pwd, _ := os.Getwd()
repo := me.forge.Repos.FindByFullPath(pwd)
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("")
}
if repo.GetCurrentBranchName() != repo.GetUserBranchName() {
diff --git a/doGui.go b/doGui.go
index fa27a84..1692a66 100644
--- a/doGui.go
+++ b/doGui.go
@@ -108,7 +108,7 @@ func globalBuildOptions(vbox *gui.Node) {
// 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
// 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()
log.Warn("setting all branches to", targetName)
if targetName == "devel" {