summaryrefslogtreecommitdiff
path: root/doNormal.go
diff options
context:
space:
mode:
authorJeff Carr <[email protected]>2025-08-31 12:16:38 -0500
committerJeff Carr <[email protected]>2025-08-31 12:16:38 -0500
commitc4252d21031ed432405be6a4f008831732068101 (patch)
tree35853d100781756ea826e6e44d2a61340faaa911 /doNormal.go
parent9292eb18fa1ccec8229c3182c2dcbeab03d09e58 (diff)
maybe locks will work. maybe I can make a global repos.pb file?
Diffstat (limited to 'doNormal.go')
-rw-r--r--doNormal.go7
1 files changed, 6 insertions, 1 deletions
diff --git a/doNormal.go b/doNormal.go
index b625f65..0382be7 100644
--- a/doNormal.go
+++ b/doNormal.go
@@ -30,6 +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())
}
if repo.GetMasterBranchName() == "" {
return log.Errorf("master branch name blank")
@@ -44,7 +45,11 @@ func checkNormalRepoState(repo *gitpb.Repo) error {
return err
}
if repo.GetCurrentBranchName() != repo.GetUserBranchName() {
- return repo.CheckoutUser()
+ if err := repo.CheckoutUser(); err != nil {
+ return err
+ }
+ _, err := me.forge.ReAdd(repo)
+ return err
}
return nil
}