Don't allow committing to existing branch when choosing new branch

Author: brechtvl

routers/web/repo/editor.go

@@ -272,7 +272,7 @@ func editFilePost(ctx *context.Context, form forms.EditRepoFileForm, isNewFile b
 	renderCommitRights(ctx, editRepo)
 
 	// Cannot commit to an existing branch if user doesn't have rights
-	if !canPushToEditRepository(ctx, editRepo, branchName, tplEditFile, &form) {
+	if !canPushToEditRepository(ctx, editRepo, branchName, form.CommitChoice, tplEditFile, &form) {
 		return
 	}
 
@@ -512,7 +512,7 @@ func DeleteFilePost(ctx *context.Context) {
 	renderCommitRights(ctx, editRepo)
 
 	// Cannot commit to an existing branch if user doesn't have rights
-	if !canPushToEditRepository(ctx, editRepo, branchName, tplDeleteFile, &form) {
+	if !canPushToEditRepository(ctx, editRepo, branchName, form.CommitChoice, tplDeleteFile, &form) {
 		return
 	}
 
@@ -710,7 +710,7 @@ func UploadFilePost(ctx *context.Context) {
 
 	renderCommitRights(ctx, editRepo)
 
-	if !canPushToEditRepository(ctx, editRepo, branchName, tplUploadFile, &form) {
+	if !canPushToEditRepository(ctx, editRepo, branchName, form.CommitChoice, tplUploadFile, &form) {
 		return
 	}
 

routers/web/repo/fork_to_edit.go

@@ -109,9 +109,9 @@ func getEditRepositoryOrError(ctx *context.Context, tpl templates.TplName, form
 
 // CheckPushEditBranch chesk if pushing to the branch in the edit repository is possible,
 // and if not renders an error and returns false.
-func canPushToEditRepository(ctx *context.Context, editRepo *repo_model.Repository, branchName string, tpl templates.TplName, form any) bool {
-	// When pushing to a fork or another branch on the same repository, it should not exist yet
-	if ctx.Repo.Repository != editRepo || ctx.Repo.BranchName != branchName {
+func canPushToEditRepository(ctx *context.Context, editRepo *repo_model.Repository, branchName, commitChoice string, tpl templates.TplName, form any) bool {
+	// When pushing to a fork or chosing to commit to a new branch, it should not exist yet
+	if ctx.Repo.Repository != editRepo || commitChoice == frmCommitChoiceNewBranch {
 		if exist, err := git_model.IsBranchExist(ctx, editRepo.ID, branchName); err == nil && exist {
 			ctx.Data["Err_NewBranchName"] = true
 			ctx.RenderWithErr(ctx.Tr("repo.editor.branch_already_exists", branchName), tpl, form)

routers/web/repo/patch.go

@@ -79,7 +79,7 @@ func NewDiffPatchPost(ctx *context.Context) {
 	renderCommitRights(ctx, editRepo)
 
 	// Cannot commit to an existing branch if user doesn't have rights
-	if !canPushToEditRepository(ctx, editRepo, branchName, tplPatchFile, &form) {
+	if !canPushToEditRepository(ctx, editRepo, branchName, form.CommitChoice, tplPatchFile, &form) {
 		return
 	}