From 637c3ec5d82f9d727724cc362aea37eeb2f64b40 Mon Sep 17 00:00:00 2001 From: a1012112796 <1012112796@qq.com> Date: Tue, 4 Jan 2022 03:45:58 +0800 Subject: Don't delete branch if other PRs with this branch are open (#18164) fix #18149 Signed-off-by: a1012112796 <1012112796@qq.com> --- routers/api/v1/repo/pull.go | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'routers/api') diff --git a/routers/api/v1/repo/pull.go b/routers/api/v1/repo/pull.go index 2b7280d39b..8297e35a17 100644 --- a/routers/api/v1/repo/pull.go +++ b/routers/api/v1/repo/pull.go @@ -873,6 +873,17 @@ func MergePullRequest(ctx *context.APIContext) { log.Trace("Pull request merged: %d", pr.ID) if form.DeleteBranchAfterMerge { + // Don't cleanup when there are other PR's that use this branch as head branch. + exist, err := models.HasUnmergedPullRequestsByHeadInfo(pr.HeadRepoID, pr.HeadBranch) + if err != nil { + ctx.ServerError("HasUnmergedPullRequestsByHeadInfo", err) + return + } + if exist { + ctx.Status(http.StatusOK) + return + } + var headRepo *git.Repository if ctx.Repo != nil && ctx.Repo.Repository != nil && ctx.Repo.Repository.ID == pr.HeadRepoID && ctx.Repo.GitRepo != nil { headRepo = ctx.Repo.GitRepo -- cgit v1.2.3