rm more readonly stuff finally
This commit is contained in:
parent
c2e3108698
commit
cb60421374
|
@ -50,6 +50,7 @@ func (r *Repo) MergeToMaster() (*cmd.Status, error) {
|
|||
if r.GetCurrentBranchName() != r.GetMasterBranchName() {
|
||||
return nil, fmt.Errorf("repo not on master branch")
|
||||
}
|
||||
/*
|
||||
if r.GetReadOnly() {
|
||||
r.Reload() // rescan the repo
|
||||
// master branch is read only. you can not git push
|
||||
|
@ -63,6 +64,7 @@ func (r *Repo) MergeToMaster() (*cmd.Status, error) {
|
|||
log.Info("can't merge to master on read only() repos. trying anyway")
|
||||
// return nil, fmt.Errorf("can't merge to master on read only() repos")
|
||||
}
|
||||
*/
|
||||
if r.CheckDirty() {
|
||||
return nil, fmt.Errorf("repo is dirty")
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue