From 8d5ec322a3b7a092a14d52b6f147ee99f9886783 Mon Sep 17 00:00:00 2001 From: jolheiser Date: Sat, 3 Sep 2022 21:52:56 -0500 Subject: [PATCH] Add special help command to bypass git-man Signed-off-by: jolheiser --- cmd/cmd.go | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/cmd/cmd.go b/cmd/cmd.go index 23dd52d..a2fa8d8 100644 --- a/cmd/cmd.go +++ b/cmd/cmd.go @@ -38,7 +38,7 @@ func New() (*ffcli.Command, error) { versionFlag := fs.Bool("version", false, "Print git-ea version") fs.BoolVar(versionFlag, "v", *versionFlag, "--version") - return &ffcli.Command{ + c := &ffcli.Command{ Name: "git-ea", FlagSet: fs, ShortUsage: "git-ea ", @@ -52,21 +52,26 @@ func New() (*ffcli.Command, error) { handler.Init(), handler.PR(), }, - Exec: func(_ context.Context, _ []string) error { - if *versionFlag { - log.Info().Msgf("git-ea v%s", Version) + } + c.Exec = func(_ context.Context, _ []string) error { + if *versionFlag { + log.Info().Msgf("git-ea v%s", Version) + return nil + } + + dir := cfg.Base + if fs.NArg() > 0 { + if strings.EqualFold(fs.Arg(0), "help") { + fmt.Println(ffcli.DefaultUsageFunc(c)) return nil } + dir = cfg.WorkspaceBranch(fs.Arg(0)) + } - dir := cfg.Base - if fs.NArg() > 0 { - dir = cfg.WorkspaceBranch(fs.Arg(0)) - } - - fmt.Println(dir) - return nil - }, - }, nil + fmt.Println(dir) + return nil + } + return c, nil } func (h *Handler) checkInit() error {