diff options
Diffstat (limited to 'branches.go')
| -rw-r--r-- | branches.go | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/branches.go b/branches.go index a503a96..0a13361 100644 --- a/branches.go +++ b/branches.go @@ -1,10 +1,10 @@ package forgepb import ( - "os" "path/filepath" "time" + "go.wit.com/lib/config" "go.wit.com/lib/gui/shell" "go.wit.com/lib/protobuf/gitpb" "go.wit.com/log" @@ -111,13 +111,12 @@ func rillCheckoutMaster(repo *gitpb.Repo) error { // 'giterr' means something is very wrong with this repo if repo.GetMasterVersion() == "giterr" { repo.CheckoutMaster() - log.Info("master == giterr. BAD REPO", repo.GetFullPath()) - log.Info("master == giterr. BAD REPO", repo.GetFullPath()) - log.Info("master == giterr. BAD REPO", repo.GetFullPath()) - cmd := []string{"git", "checkout", "main"} // todo: figure out main - repo.RunVerbose(cmd) - os.Exit(-1) - return nil + log.Info(repo.GetFullPath(), "master == giterr. BAD REPO") + log.Info(repo.GetFullPath(), "master == giterr. BAD REPO git describe --tags master --always") + log.Info(repo.GetFullPath(), "master == giterr. BAD REPO. todo: figure this out in rillCheckoutMaster()") + // cmd := []string{"git", "checkout", "main"} // todo: figure out main + // repo.RunVerbose(cmd) + return log.Errorf("master version can not be determined") } if repo.GetCurrentBranchName() == repo.GetMasterBranchName() { // repo is already on master @@ -245,7 +244,7 @@ func (f *Forge) DoAllCheckoutDevelNew(force bool) error { counter += 1 } log.Info("reloaded", counter, "repos") - f.configSave = true + config.SetChanged("repos", true) return nil } |