quiet output
This commit is contained in:
parent
5637809f5c
commit
03b8e58451
|
@ -34,7 +34,7 @@ func doCheckout() error {
|
||||||
}
|
}
|
||||||
|
|
||||||
if argv.Checkout.Master != nil {
|
if argv.Checkout.Master != nil {
|
||||||
setForgeMode(forgepb.ForgeMode_MASTER) // disable "normal" mode if set
|
setForgeMode(forgepb.ForgeMode_CLEAN) // disable "normal" mode if set
|
||||||
|
|
||||||
if err := me.forge.DoAllCheckoutMaster(); err != nil {
|
if err := me.forge.DoAllCheckoutMaster(); err != nil {
|
||||||
badExit(err)
|
badExit(err)
|
||||||
|
|
|
@ -249,7 +249,7 @@ func justDeleteTheDevelBranchAlready(repo *gitpb.Repo) error {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
cmd := []string{"git", "merge something somehow"}
|
cmd := []string{"git", "merge something somehow"}
|
||||||
log.Info("DEVEL LOCAL NEEDS GIT MERGE TO MASTER", repo.GetGoPath(), cmd, b1)
|
log.Info("devel local, remote and master branches are wrong", repo.GetGoPath(), cmd, b1)
|
||||||
// _, err := repo.RunVerbose(cmd)
|
// _, err := repo.RunVerbose(cmd)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
4
main.go
4
main.go
|
@ -73,7 +73,7 @@ func main() {
|
||||||
}
|
}
|
||||||
|
|
||||||
if argv.Checkout != nil {
|
if argv.Checkout != nil {
|
||||||
setForgeMode(forgepb.ForgeMode_MASTER)
|
setForgeMode(forgepb.ForgeMode_DEVEL)
|
||||||
if err := doCheckout(); err != nil {
|
if err := doCheckout(); err != nil {
|
||||||
badExit(err)
|
badExit(err)
|
||||||
}
|
}
|
||||||
|
@ -133,7 +133,7 @@ func main() {
|
||||||
log.Info("you were aleady not in the normal state")
|
log.Info("you were aleady not in the normal state")
|
||||||
okExit("")
|
okExit("")
|
||||||
}
|
}
|
||||||
setForgeMode(forgepb.ForgeMode_MASTER)
|
setForgeMode(forgepb.ForgeMode_DEVEL)
|
||||||
log.Info("normal mode off")
|
log.Info("normal mode off")
|
||||||
okExit("")
|
okExit("")
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue