Don't delete unrenamed protected branch

Author: lunny

models/git/branch.go

@@ -406,11 +406,6 @@ func RenameBranch(ctx context.Context, repo *repo_model.Repository, from, to str
 				if _, err = sess.ID(protectedBranch.ID).Cols("branch_name").Update(protectedBranch); err != nil {
 					return err
 				}
-			} else {
-				// Delete the old rule since the branch no longer exists and the target already has a rule
-				if _, err = sess.ID(protectedBranch.ID).Delete(&ProtectedBranch{}); err != nil {
-					return err
-				}
 			}
 		} else {
 			// some glob protect rules may match this branch

models/git/branch_test.go

@@ -197,7 +197,8 @@ func TestRenameBranchProtectedRuleConflict(t *testing.T) {
 
 	protectedDev, err := git_model.GetProtectedBranchRuleByName(t.Context(), repo1.ID, "dev")
 	assert.NoError(t, err)
-	assert.Nil(t, protectedDev)
+	assert.NotNil(t, protectedDev)
+	assert.Equal(t, "dev", protectedDev.RuleName)
 
 	protectedMainByID, err := git_model.GetProtectedBranchRuleByID(t.Context(), repo1.ID, pbMain.ID)
 	assert.NoError(t, err)