diff options
Diffstat (limited to 'repo.merge.go')
| -rw-r--r-- | repo.merge.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/repo.merge.go b/repo.merge.go index 7f18d1c..1b07558 100644 --- a/repo.merge.go +++ b/repo.merge.go @@ -8,7 +8,7 @@ import ( ) func (r *Repo) MergeToDevel() (*cmd.Status, error) { - r.Reload() + r.ReloadCheck() if r.GetCurrentBranchName() != r.GetDevelBranchName() { return nil, fmt.Errorf("repo not on devel branch") } @@ -28,7 +28,7 @@ func (r *Repo) MergeToDevel() (*cmd.Status, error) { } if !r.IsBranchRemote(devel) { - r.Reload() // rescan the repo + r.ReloadCheck() // rescan the repo // devel branch is not remote. do not try 'git push' return nil, nil } @@ -40,19 +40,19 @@ func (r *Repo) MergeToDevel() (*cmd.Status, error) { log.Log(WARN, "GitPushToDevel() failed", r.GetFullPath()) return nil, result.Error } - r.Reload() // rescan the repo + r.ReloadCheck() // rescan the repo return nil, nil } func (r *Repo) MergeToMaster() (*cmd.Status, error) { - r.Reload() + r.ReloadCheck() if r.GetCurrentBranchName() != r.GetMasterBranchName() { return nil, fmt.Errorf("repo not on master branch") } /* if r.GetReadOnly() { - r.Reload() // rescan the repo + r.ReloadCheck() // rescan the repo // master branch is read only. you can not git push lh := r.GetLocalHash("devel") rh := r.GetRemoteHash("devel") @@ -87,6 +87,6 @@ func (r *Repo) MergeToMaster() (*cmd.Status, error) { log.Log(WARN, "GitPushToMaster() failed", r.GetFullPath()) return nil, result.Error } - r.Reload() // rescan the repo + r.ReloadCheck() // rescan the repo return nil, nil } |