From 46f9fc2bc664a13ec8fdfd31b36c0b81bb675b5e Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Sun, 4 Aug 2024 11:21:42 +0800 Subject: [PATCH] Rename head branch of pull requests when renaming a branch (#31759) Fix #31716 (cherry picked from commit 572aaebd96b43bc576fe32187be82f689e855464) --- models/git/branch.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/models/git/branch.go b/models/git/branch.go index 7e1c96d769..f004d502ac 100644 --- a/models/git/branch.go +++ b/models/git/branch.go @@ -385,6 +385,13 @@ func RenameBranch(ctx context.Context, repo *repo_model.Repository, from, to str return err } + // 4.1 Update all not merged pull request head branch name + if _, err = sess.Table("pull_request").Where("head_repo_id=? AND head_branch=? AND has_merged=?", + repo.ID, from, false). + Update(map[string]any{"head_branch": to}); err != nil { + return err + } + // 5. insert renamed branch record renamedBranch := &RenamedBranch{ RepoID: repo.ID,