summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doNormal.go3
-rw-r--r--main.go5
2 files changed, 6 insertions, 2 deletions
diff --git a/doNormal.go b/doNormal.go
index 0382be7..7a00a16 100644
--- a/doNormal.go
+++ b/doNormal.go
@@ -30,7 +30,7 @@ func checkNormalRepoState(repo *gitpb.Repo) error {
if repo.GetMasterBranchName() == "" {
me.forge.VerifyBranchNames(repo)
configSave = true
- log.Info("ABNORMAL: master branch name was blank in", repo.GetFullPath())
+ // log.Info("ABNORMAL: master branch name was blank in", repo.GetFullPath())
}
if repo.GetMasterBranchName() == "" {
return log.Errorf("master branch name blank")
@@ -45,6 +45,7 @@ func checkNormalRepoState(repo *gitpb.Repo) error {
return err
}
if repo.GetCurrentBranchName() != repo.GetUserBranchName() {
+ configSave = true
if err := repo.CheckoutUser(); err != nil {
return err
}
diff --git a/main.go b/main.go
index 68b7016..8958545 100644
--- a/main.go
+++ b/main.go
@@ -130,7 +130,10 @@ func main() {
}
if argv.Normal != nil {
- doNormal()
+ if doNormal() {
+ log.Infof("all %d repos are on your user branch. It is safe to write code now.\n", me.forge.Repos.Len())
+ okExit("")
+ }
okExit("")
}