From cc910014ab0df4d252ee61995df37b4a4cb92e06 Mon Sep 17 00:00:00 2001
From: Lunny Xiao <xiaolunwen@gmail.com>
Date: Wed, 1 Feb 2023 06:11:48 +0800
Subject: [PATCH] Fix wrong hint when deleting a branch successfully from pull
request UI (#22673)
Fix #18785
---
routers/web/repo/pull.go | 2 +-
tests/integration/pull_merge_test.go | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/routers/web/repo/pull.go b/routers/web/repo/pull.go
index c2208120fcf..71bc98d13d0 100644
--- a/routers/web/repo/pull.go
+++ b/routers/web/repo/pull.go
@@ -1395,7 +1395,7 @@ func CleanUpPullRequest(ctx *context.Context) {
}
func deleteBranch(ctx *context.Context, pr *issues_model.PullRequest, gitRepo *git.Repository) {
- fullBranchName := pr.HeadRepo.Owner.Name + "/" + pr.HeadBranch
+ fullBranchName := pr.HeadRepo.FullName() + ":" + pr.HeadBranch
if err := repo_service.DeleteBranch(ctx.Doer, pr.HeadRepo, gitRepo, pr.HeadBranch); err != nil {
switch {
case git.IsErrBranchNotExist(err):
diff --git a/tests/integration/pull_merge_test.go b/tests/integration/pull_merge_test.go
index 491fc0e0aaf..e80822a7520 100644
--- a/tests/integration/pull_merge_test.go
+++ b/tests/integration/pull_merge_test.go
@@ -187,7 +187,7 @@ func TestPullCleanUpAfterMerge(t *testing.T) {
htmlDoc := NewHTMLParser(t, resp.Body)
resultMsg := htmlDoc.doc.Find(".ui.message>p").Text()
- assert.EqualValues(t, "Branch 'user1/feature/test' has been deleted.", resultMsg)
+ assert.EqualValues(t, "Branch 'user1/repo1:feature/test' has been deleted.", resultMsg)
})
}