diff options
| -rw-r--r-- | doClean.go | 8 | ||||
| -rw-r--r-- | doNormal.go | 2 | ||||
| -rw-r--r-- | windowReposFix.go | 2 |
3 files changed, 4 insertions, 8 deletions
@@ -20,15 +20,11 @@ func checkRemoteBranches(repo *gitpb.Repo) error { } if repo.VerifyRemoteAndLocalBranches(repo.GetDevelBranchName()) { } else { - repo.Reload() - me.forge.SetConfigSave(true) - return log.Errorf("remote devel is out of sync with local") + return log.Errorf("remote devel is out of sync with local: todo: git pull or git fetch") } if repo.VerifyRemoteAndLocalBranches(repo.GetMasterBranchName()) { } else { - repo.Reload() - me.forge.SetConfigSave(true) - return log.Errorf("remote master is out of sync with local") + return log.Errorf("remote master is out of sync with local: todo: git pull or git fetch") } return nil } diff --git a/doNormal.go b/doNormal.go index c4ec1bb..964c8ab 100644 --- a/doNormal.go +++ b/doNormal.go @@ -70,7 +70,7 @@ func checkNormalRepoState(repo *gitpb.Repo) error { configSave = true log.Info("changing to user branch", repo.FullPath) repo.CheckoutUser() - repo.Reload() + repo.ReloadCheck() return log.Errorf("now on user branch") } return nil diff --git a/windowReposFix.go b/windowReposFix.go index 4b5d534..c9a87e1 100644 --- a/windowReposFix.go +++ b/windowReposFix.go @@ -99,7 +99,7 @@ func makeReposWin() *stdReposTableWin { cmd = []string{"git", "branch", "--delete", "--remote", "origin/" + brname} log.Info(repo.GetGoPath(), cmd) repo.RunVerbose(cmd) - repo.Reload() + repo.ReloadCheck() } me.forge.SetConfigSave(true) me.forge.ConfigSave() |