Update models/git/protected_branch.go

6543 · lunny · web-flow · commit 3c17638bc099 · 2024-10-17T11:11:09.000+02:00
Co-authored-by: Lunny Xiao &lt;xiaolunwen@gmail.com&gt;
diff --git a/models/git/protected_branch.go b/models/git/protected_branch.go
@@ -83,7 +83,8 @@ func IsRuleNameSpecial(ruleName string) bool {
 }
 
 func (protectBranch *ProtectedBranch) loadGlob() {
-	if protectBranch.globRule == nil && !protectBranch.isPlainName {
+	if protectBranch.isPlainName || protectBranch.globRule != nil {
+	    return
 		// detect if it is not glob
 		if !IsRuleNameSpecial(protectBranch.RuleName) {
 			protectBranch.isPlainName = true

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,8 @@ func IsRuleNameSpecial(ruleName string) bool {`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`func (protectBranch *ProtectedBranch) loadGlob() {`
`86`		`- if protectBranch.globRule == nil && !protectBranch.isPlainName {`
	`86`	`+ if protectBranch.isPlainName \|\| protectBranch.globRule != nil {`
	`87`	`+ return`
`87`	`88`	`// detect if it is not glob`
`88`	`89`	`if !IsRuleNameSpecial(protectBranch.RuleName) {`
`89`	`90`	`protectBranch.isPlainName = true`