From 4546d067dd47c5af0ba0ad3defa4b9511047dce8 Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Sat, 11 Jan 2025 07:45:16 -0600 Subject: add 'forge commit' so I don't commit on the wrong branch --- main.go | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'main.go') diff --git a/main.go b/main.go index 76e4a0a..bd3d743 100644 --- a/main.go +++ b/main.go @@ -8,6 +8,7 @@ import ( "go.wit.com/dev/alexflint/arg" "go.wit.com/gui" + "go.wit.com/lib/gui/shell" "go.wit.com/lib/protobuf/forgepb" "go.wit.com/lib/protobuf/gitpb" "go.wit.com/log" @@ -60,6 +61,26 @@ func main() { okExit("") } + if argv.Commit != nil { + pwd, _ := os.Getwd() + repo := me.forge.Repos.FindByFullPath(pwd) + if repo == nil { + log.Info("what branch are you on?: todo: examine this") + okExit("") + } + if repo.GetCurrentBranchName() != repo.GetUserBranchName() { + me.found.Append(repo) + me.forge.PrintHumanTable(me.found) + log.Info("") + log.Info("wrong branch. Can not commit on", repo.GetCurrentBranchName()) + log.Info("") + okExit("") + } + shell.Exec([]string{"git", "diff"}) + shell.Exec([]string{"git", "commit", "--all"}) + okExit("forge done") + } + if argv.Checkout != nil { if argv.Checkout.User != nil { if argv.Force { -- cgit v1.2.3