Don't delete branch if other PRs with this branch are open

fix #18149 Signed-off-by: a1012112796 <[email protected]>
go-gitea · Jan 3, 2022 · f7f627c · f7f627c
1 parent f499f23
commit f7f627c
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 1 deletion.
diff --git 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 other pr use this branch as head branch
+		prs, err := models.GetUnmergedPullRequestsByHeadInfo(pr.HeadRepoID, pr.HeadBranch)
+		if err != nil {
+			ctx.ServerError("GetUnmergedPullRequestsByHeadInfo", err)
+			return
+		}
+		if len(prs) > 0 {
+			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

diff --git a/routers/web/repo/issue.go b/routers/web/repo/issue.go
@@ -1600,11 +1600,23 @@ func ViewIssue(ctx *context.Context) {
 		} else {
 			ctx.Data["WontSignReason"] = "not_signed_in"
 		}
-		ctx.Data["IsPullBranchDeletable"] = canDelete &&
+
+		isPullBranchDeletable := canDelete &&
 			pull.HeadRepo != nil &&
 			git.IsBranchExist(ctx, pull.HeadRepo.RepoPath(), pull.HeadBranch) &&
 			(!pull.HasMerged || ctx.Data["HeadBranchCommitID"] == ctx.Data["PullHeadCommitID"])
 
+		if isPullBranchDeletable && pull.HasMerged {
+			prs, err := models.GetUnmergedPullRequestsByHeadInfo(pull.HeadRepoID, pull.HeadBranch)
+			if err != nil {
+				ctx.ServerError("GetUnmergedPullRequestsByHeadInfo", err)
+				return
+			}
+
+			isPullBranchDeletable = len(prs) == 0
+		}
+		ctx.Data["IsPullBranchDeletable"] = isPullBranchDeletable
+
 		stillCanManualMerge := func() bool {
 			if pull.HasMerged || issue.IsClosed || !ctx.IsSigned {
 				return false

diff --git a/routers/web/repo/pull.go b/routers/web/repo/pull.go
@@ -1052,6 +1052,17 @@ func MergePullRequest(ctx *context.Context) {
 	log.Trace("Pull request merged: %d", pr.ID)
 
 	if form.DeleteBranchAfterMerge {
+		// Don't cleanup when other pr use this branch as head branch
+		prs, err := models.GetUnmergedPullRequestsByHeadInfo(pr.HeadRepoID, pr.HeadBranch)
+		if err != nil {
+			ctx.ServerError("GetUnmergedPullRequestsByHeadInfo", err)
+			return
+		}
+		if len(prs) > 0 {
+			ctx.Redirect(issue.Link())
+			return
+		}
+
 		var headRepo *git.Repository
 		if ctx.Repo != nil && ctx.Repo.Repository != nil && pr.HeadRepoID == ctx.Repo.Repository.ID && ctx.Repo.GitRepo != nil {
 			headRepo = ctx.Repo.GitRepo
@@ -1261,6 +1272,17 @@ func CleanUpPullRequest(ctx *context.Context) {
 		return
 	}
 
+	// Don't cleanup when other pr use this branch as head branch
+	prs, err := models.GetUnmergedPullRequestsByHeadInfo(pr.HeadRepoID, pr.HeadBranch)
+	if err != nil {
+		ctx.ServerError("GetUnmergedPullRequestsByHeadInfo", err)
+		return
+	}
+	if len(prs) > 0 {
+		ctx.NotFound("CleanUpPullRequest", nil)
+		return
+	}
+
 	if err := pr.LoadHeadRepo(); err != nil {
 		ctx.ServerError("LoadHeadRepo", err)
 		return