sort non glob protected branch roules by name

Author: 6543

models/git/protected_banch_list_test.go

@@ -92,7 +92,7 @@ func TestBranchRuleSort(t *testing.T) {
 		RuleName:    "a",
 		CreatedUnix: 4,
 	}}
-	expect := []string{"c", "b", "a", "a/*", "b/*"}
+	expect := []string{"a", "b", "c", "a/*", "b/*"}
 
 	pbr := ProtectedBranchRules(in)
 	pbr.sort()

models/git/protected_branch_list.go

@@ -6,6 +6,7 @@ package git
 import (
 	"context"
 	"sort"
+	"strings"
 
 	"code.gitea.io/gitea/models/db"
 	"code.gitea.io/gitea/modules/optional"
@@ -29,7 +30,12 @@ func (rules ProtectedBranchRules) sort() {
 		rules[i].loadGlob()
 		rules[j].loadGlob()
 		if rules[i].isPlainName != rules[j].isPlainName {
-			return rules[i].isPlainName // plain name comes first, so plain name means "less"
+			// plain name comes first, so plain name means "less"
+			return rules[i].isPlainName
+		}
+		if rules[i].isPlainName {
+			// both are plain names so sort alphabetically
+			return strings.Compare(rules[i].RuleName, rules[j].RuleName) < 0
 		}
 		return rules[i].CreatedUnix < rules[j].CreatedUnix
 	})