make sure default branch can not be deleted

integrations/api_branch_test.go

@@ -80,6 +80,13 @@ func testAPIDeleteBranchProtection(t *testing.T, branchName string, expectedHTTP
  session.MakeRequest(t, req, expectedHTTPStatus)
 }
 
+func testAPIDeleteBranch(t *testing.T, branchName string, expectedHTTPStatus int) {
+ session := loginUser(t, "user2")
+ token := getTokenForLoggedInUser(t, session)
+ req := NewRequestf(t, "DELETE", "/api/v1/repos/user2/repo1/branches/%s?token=%s", branchName, token)
+ session.MakeRequest(t, req, expectedHTTPStatus)
+}
+
 func TestAPIGetBranch(t *testing.T) {
  for _, test := range []struct {
  BranchName string
@@ -106,10 +113,17 @@ func TestAPIBranchProtection(t *testing.T) {
  // Can only create once
  testAPICreateBranchProtection(t, "master", http.StatusForbidden)
 
+ // Can't delete a protected branch
+ testAPIDeleteBranch(t, "master", http.StatusForbidden)
+
  testAPIGetBranchProtection(t, "master", http.StatusOK)
  testAPIEditBranchProtection(t, "master", &api.BranchProtection{
  EnablePush: true,
  }, http.StatusOK)
 
  testAPIDeleteBranchProtection(t, "master", http.StatusNoContent)
+
+ // Test branch deletion
+ testAPIDeleteBranch(t, "master", http.StatusForbidden)
+ testAPIDeleteBranch(t, "branch2", http.StatusNoContent)
 }

options/locale/locale_en-US.ini

@@ -1671,6 +1671,7 @@ branch.deleted_by = Deleted by %s
 branch.restore_success = Branch '%s' has been restored.
 branch.restore_failed = Failed to restore branch '%s'.
 branch.protected_deletion_failed = Branch '%s' is protected. It cannot be deleted.
+branch.dfault_deletion_failed = Branch '%s' is default branch. It cannot be deleted.
 branch.restore = Restore Branch '%s'
 branch.download = Download Branch '%s'
 branch.included_desc = This branch is part of the default branch

routers/api/v1/repo/branch.go

@@ -121,6 +121,11 @@ func DeleteBranch(ctx *context.APIContext) {
  return
  }
 
+ if ctx.Repo.Repository.DefaultBranch == ctx.Repo.BranchName {
+ ctx.Error(http.StatusForbidden, "DefaultBranch", fmt.Errorf("can not delete default branch"))
+ return
+ }
+
  isProtected, err := ctx.Repo.Repository.IsProtectedBranch(ctx.Repo.BranchName, ctx.User)
  if err != nil {
  ctx.InternalServerError(err)

routers/repo/branch.go

@@ -56,8 +56,13 @@ func Branches(ctx *context.Context) {
 // DeleteBranchPost responses for delete merged branch
 func DeleteBranchPost(ctx *context.Context) {
  defer redirect(ctx)
-
  branchName := ctx.Query("name")
+
+ if ctx.Repo.Repository.DefaultBranch == ctx.Repo.BranchName {
+ ctx.Flash.Error(ctx.Tr("repo.branch.dfault_deletion_failed", branchName))
+ return
+ }
+
  isProtected, err := ctx.Repo.Repository.IsProtectedBranch(branchName, ctx.User)
  if err != nil {
  log.Error("DeleteBranch: %v", err)