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 } }