quiet output
This commit is contained in:
parent
5460316daf
commit
d47d25e3a6
|
@ -77,7 +77,7 @@ func (repo *Repo) DeleteLocalDevelBranch() error {
|
||||||
if b1 == 0 {
|
if b1 == 0 {
|
||||||
cmd := []string{"git", "branch", "-D", repo.GetDevelBranchName()}
|
cmd := []string{"git", "branch", "-D", repo.GetDevelBranchName()}
|
||||||
// log.Info("DEVEL IS IN REMOTE", repo.GetGoPath(), cmd)
|
// log.Info("DEVEL IS IN REMOTE", repo.GetGoPath(), cmd)
|
||||||
err := repo.RunVerbose(cmd)
|
_, err := repo.RunVerboseOnError(cmd)
|
||||||
return err
|
return err
|
||||||
} else {
|
} else {
|
||||||
return fmt.Errorf("local branch has patches not in remote")
|
return fmt.Errorf("local branch has patches not in remote")
|
||||||
|
|
|
@ -12,7 +12,7 @@ func (repo *Repo) CheckoutMaster() bool {
|
||||||
bName := repo.GetMasterBranchName()
|
bName := repo.GetMasterBranchName()
|
||||||
if bName == "giterr" {
|
if bName == "giterr" {
|
||||||
cmd := []string{"git", "checkout", "main"} // todo: figure out main
|
cmd := []string{"git", "checkout", "main"} // todo: figure out main
|
||||||
repo.RunVerbose(cmd)
|
repo.RunVerboseOnError(cmd)
|
||||||
os.Exit(-1)
|
os.Exit(-1)
|
||||||
// TODO: try to fix this
|
// TODO: try to fix this
|
||||||
if repo.checkoutBranch("main") {
|
if repo.checkoutBranch("main") {
|
||||||
|
@ -20,7 +20,7 @@ func (repo *Repo) CheckoutMaster() bool {
|
||||||
return true
|
return true
|
||||||
} else {
|
} else {
|
||||||
cmd := []string{"git", "checkout", "main"} // todo: figure out main
|
cmd := []string{"git", "checkout", "main"} // todo: figure out main
|
||||||
repo.RunVerbose(cmd)
|
repo.RunVerboseOnError(cmd)
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue