From 5d57a8968d7b2cdd2e6ab9ee8ef0af9c9fc2fc23 Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Mon, 7 Jul 2025 20:27:10 -0500 Subject: s/GitPull/Pull/ --- argv.go | 2 +- argvAutoshell.go | 4 ++-- doPull.go | 6 +++--- doSync.go | 4 ++-- main.go | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/argv.go b/argv.go index 2502a23..4a7b192 100644 --- a/argv.go +++ b/argv.go @@ -24,7 +24,7 @@ type args struct { GitFetch *FindCmd `arg:"subcommand:fetch" help:"run 'git fetch master'"` List *FindCmd `arg:"subcommand:list" help:"print a table of the current repos"` Patch *PatchCmd `arg:"subcommand:patch" help:"make patchsets"` - GitPull *PullCmd `arg:"subcommand:pull" help:"run 'git pull'"` + Pull *PullCmd `arg:"subcommand:pull" help:"run 'git pull'"` URL string `arg:"--connect" help:"forge url"` All bool `arg:"--all" help:"git commit --all"` Build string `arg:"--build" help:"build a repo"` diff --git a/argvAutoshell.go b/argvAutoshell.go index 30e5677..e1afaae 100644 --- a/argvAutoshell.go +++ b/argvAutoshell.go @@ -46,7 +46,7 @@ func (args) doBashAuto() { case "list": fmt.Println("--full") case "pull": - fmt.Println("list dirty patches sync --force") + fmt.Println("dirty clean list patches sync --force") case "--find": fmt.Println("foo bar") case "patch": @@ -64,7 +64,7 @@ func (args) doBashAuto() { default: if argv.BashAuto[0] == ARGNAME { // list the subcommands here - fmt.Println("--bash list checkout clean commit config dirty debug fetch patch pull") + fmt.Println("--bash list checkout commit config dirty debug fetch patch pull") } } os.Exit(0) diff --git a/doPull.go b/doPull.go index 9bfbc34..6e341b2 100644 --- a/doPull.go +++ b/doPull.go @@ -44,7 +44,7 @@ func rillPull(repo *gitpb.Repo) error { // is every repo on the devel branch? func doGitPullNew() error { - if argv.GitPull == nil { + if argv.Pull == nil { return fmt.Errorf("not really 'fetch pull'") } @@ -63,11 +63,11 @@ func doGitPullNew() error { check := gitpb.NewRepos() - if argv.GitPull.Dirty != nil { + if argv.Pull.Dirty != nil { check = findDirty() } - if argv.GitPull.Patches != nil { + if argv.Pull.Patches != nil { check = findReposWithPatches() } diff --git a/doSync.go b/doSync.go index 57bf0c6..92e11dc 100644 --- a/doSync.go +++ b/doSync.go @@ -16,10 +16,10 @@ import ( // trys to figure out if there is still something to update func doSync() error { - if argv.GitPull.Sync.Clean != nil { + if argv.Pull.Sync.Clean != nil { return doSyncClean() } - if argv.GitPull.Sync.User != nil { + if argv.Pull.Sync.User != nil { return doSyncUser() } diff --git a/main.go b/main.go index d9dcd73..6f0ea5f 100644 --- a/main.go +++ b/main.go @@ -138,8 +138,8 @@ func main() { okExit("") } - if argv.GitPull != nil { - if argv.GitPull.Sync != nil { + if argv.Pull != nil { + if argv.Pull.Sync != nil { if err := doSync(); err != nil { badExit(err) } -- cgit v1.2.3