diff options
| author | a1012112796 <1012112796@qq.com> | 2022-01-04 03:45:58 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-03 20:45:58 +0100 |
| commit | 637c3ec5d82f9d727724cc362aea37eeb2f64b40 (patch) | |
| tree | 2b3af5ec2e6595d037a78b8a45e0a95210ab7d14 /routers/api | |
| parent | 650a50a7ba8efcd8d02c4c93e5abc19f27e6c4b5 (diff) | |
| download | gitea-637c3ec5d82f9d727724cc362aea37eeb2f64b40.tar.gz gitea-637c3ec5d82f9d727724cc362aea37eeb2f64b40.zip | |
Don't delete branch if other PRs with this branch are open (#18164)
fix #18149
Signed-off-by: a1012112796 <1012112796@qq.com>
Diffstat (limited to 'routers/api')
| -rw-r--r-- | routers/api/v1/repo/pull.go | 11 |
1 files changed, 11 insertions, 0 deletions
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 |