tdsds.com/gitea
1
1
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2025-08-12 04:28:21 +00:00
Code Releases Activity

Fix adding branch as protected to not allow pushing to it (#2556)

Browse Source 
* Fix adding branch as protected to not allow pushing to it

* Fix can_push value to false in protected_branch (#2560)

* Fix integration test
This commit is contained in:
Lauris BH
2017-09-20 20:14:09 +03:00
committed by GitHub
parent f014e42a06
commit 25e71ad41e
7 changed files with 34 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
cmd/hook.go
View File

@@ -127,14 +127,12 @@ func runHookPreReceive(c *cli.Context) error {
}
if protectBranch != nil {
if !protectBranch.CanPush {
// check and deletion
if newCommitID == git.EmptySHA {
fail(fmt.Sprintf("branch %s is protected from deletion", branchName), "")
} else {
fail(fmt.Sprintf("protected branch %s can not be pushed to", branchName), "")
//fail(fmt.Sprintf("branch %s is protected from force push", branchName), "")
}
// check and deletion
if newCommitID == git.EmptySHA {
fail(fmt.Sprintf("branch %s is protected from deletion", branchName), "")
} else if !protectBranch.CanPush {
fail(fmt.Sprintf("protected branch %s can not be pushed to", branchName), "")
//fail(fmt.Sprintf("branch %s is protected from force push", branchName), "")
}
}
}