rm readonly checks finally
This commit is contained in:
parent
bf59b9124a
commit
c2e3108698
|
@ -32,11 +32,6 @@ func (r *Repo) MergeToDevel() (*cmd.Status, error) {
|
||||||
// devel branch is not remote. do not try 'git push'
|
// devel branch is not remote. do not try 'git push'
|
||||||
return nil, nil
|
return nil, nil
|
||||||
}
|
}
|
||||||
if r.GetReadOnly() {
|
|
||||||
r.Reload() // rescan the repo
|
|
||||||
// devel branch is read only. you can not git push
|
|
||||||
return nil, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// it seems like we have write access. lets find out!
|
// it seems like we have write access. lets find out!
|
||||||
cmd = []string{"git", "push"}
|
cmd = []string{"git", "push"}
|
||||||
|
@ -83,12 +78,6 @@ func (r *Repo) MergeToMaster() (*cmd.Status, error) {
|
||||||
return nil, result.Error
|
return nil, result.Error
|
||||||
}
|
}
|
||||||
|
|
||||||
if r.GetReadOnly() {
|
|
||||||
r.Reload() // rescan the repo
|
|
||||||
// master branch is read only. you can not git push
|
|
||||||
return nil, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// it seems like we have write access. lets find out!
|
// it seems like we have write access. lets find out!
|
||||||
cmd = []string{"git", "push"}
|
cmd = []string{"git", "push"}
|
||||||
result = r.RunRealtimeVerbose(cmd)
|
result = r.RunRealtimeVerbose(cmd)
|
||||||
|
|
Loading…
Reference in New Issue