diff options
| author | Jeff Carr <[email protected]> | 2025-08-21 12:30:46 -0500 |
|---|---|---|
| committer | Jeff Carr <[email protected]> | 2025-08-21 12:30:46 -0500 |
| commit | d47d25e3a696bde60bdce135829ac9de3f3291d5 (patch) | |
| tree | 85accb0f723c898ab5c5691c1e9954feeb8caf71 | |
| parent | 5460316daf2cfda3ee0145a1725dbc5be9cd66c4 (diff) | |
quiet outputv0.0.108
| -rw-r--r-- | branches.go | 2 | ||||
| -rw-r--r-- | checkout.go | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/branches.go b/branches.go index 378505e..4c24872 100644 --- a/branches.go +++ b/branches.go @@ -77,7 +77,7 @@ func (repo *Repo) DeleteLocalDevelBranch() error { if b1 == 0 { cmd := []string{"git", "branch", "-D", repo.GetDevelBranchName()} // log.Info("DEVEL IS IN REMOTE", repo.GetGoPath(), cmd) - err := repo.RunVerbose(cmd) + _, err := repo.RunVerboseOnError(cmd) return err } else { return fmt.Errorf("local branch has patches not in remote") diff --git a/checkout.go b/checkout.go index f2df501..4b46841 100644 --- a/checkout.go +++ b/checkout.go @@ -12,7 +12,7 @@ func (repo *Repo) CheckoutMaster() bool { bName := repo.GetMasterBranchName() if bName == "giterr" { cmd := []string{"git", "checkout", "main"} // todo: figure out main - repo.RunVerbose(cmd) + repo.RunVerboseOnError(cmd) os.Exit(-1) // TODO: try to fix this if repo.checkoutBranch("main") { @@ -20,7 +20,7 @@ func (repo *Repo) CheckoutMaster() bool { return true } else { cmd := []string{"git", "checkout", "main"} // todo: figure out main - repo.RunVerbose(cmd) + repo.RunVerboseOnError(cmd) return false } } |
