ibnezzoubayr/Atay-Makhzan
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix bug the protected branch rule name is conflicted with renamed branch name (#36650)

Browse Source 
Fix #36464
This commit is contained in:
Lunny Xiao
2026-02-17 12:01:56 -08:00
committed by GitHub
parent ddacefa5d6
commit 318cb85037
2 changed files with 55 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
models/git/branch.go
+8 -2
View File
@@ -397,10 +397,16 @@ func RenameBranch(ctx context.Context, repo *repo_model.Repository, from, to str
if protectedBranch != nil {
// there is a protect rule for this branch
protectedBranch.RuleName = to
if _, err = sess.ID(protectedBranch.ID).Cols("branch_name").Update(protectedBranch); err != nil {
existingRule, err := GetProtectedBranchRuleByName(ctx, repo.ID, to)
if err != nil {
return err
}
if existingRule == nil || existingRule.ID == protectedBranch.ID {
protectedBranch.RuleName = to
if _, err = sess.ID(protectedBranch.ID).Cols("branch_name").Update(protectedBranch); err != nil {
return err
}
}
} else {
// some glob protect rules may match this branch
protected, err := IsBranchProtected(ctx, repo.ID, from)