|
|
@@ -17,7 +17,6 @@ import ( |
|
|
|
"code.gitea.io/gitea/modules/log" |
|
|
|
"code.gitea.io/gitea/modules/notification" |
|
|
|
repo_module "code.gitea.io/gitea/modules/repository" |
|
|
|
pull_service "code.gitea.io/gitea/services/pull" |
|
|
|
) |
|
|
|
|
|
|
|
// CreateNewBranch creates a new repository branch |
|
|
@@ -181,10 +180,6 @@ func DeleteBranch(ctx context.Context, doer *user_model.User, repo *repo_model.R |
|
|
|
return err |
|
|
|
} |
|
|
|
|
|
|
|
if err := pull_service.CloseBranchPulls(doer, repo.ID, branchName); err != nil { |
|
|
|
return err |
|
|
|
} |
|
|
|
|
|
|
|
// Don't return error below this |
|
|
|
if err := PushUpdate( |
|
|
|
&repo_module.PushUpdateOptions{ |
|
|
@@ -199,9 +194,5 @@ func DeleteBranch(ctx context.Context, doer *user_model.User, repo *repo_model.R |
|
|
|
log.Error("Update: %v", err) |
|
|
|
} |
|
|
|
|
|
|
|
if err := git_model.AddDeletedBranch(ctx, repo.ID, branchName, commit.ID.String(), doer.ID); err != nil { |
|
|
|
log.Warn("AddDeletedBranch: %v", err) |
|
|
|
} |
|
|
|
|
|
|
|
return nil |
|
|
|
} |