summaryrefslogtreecommitdiff
path: root/repo.merge.go
diff options
context:
space:
mode:
Diffstat (limited to 'repo.merge.go')
-rw-r--r--repo.merge.go5
1 files changed, 5 insertions, 0 deletions
diff --git a/repo.merge.go b/repo.merge.go
index 441585a..20bc5b0 100644
--- a/repo.merge.go
+++ b/repo.merge.go
@@ -55,6 +55,11 @@ 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
+ return nil, fmt.Errorf("can't merge to master on read only() repos")
+ }
if r.CheckDirty() {
return nil, fmt.Errorf("repo is dirty")
}