diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2023-02-01 06:11:48 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-31 22:11:48 +0000 |
| commit | cc910014ab0df4d252ee61995df37b4a4cb92e06 (patch) | |
| tree | d7a9344c02ed0531fcca0f6d9128498ea37bcfac | |
| parent | f1f0430f9fd731310713ad723bed9618bcd53cda (diff) | |
| download | gitea-cc910014ab0df4d252ee61995df37b4a4cb92e06.tar.gz gitea-cc910014ab0df4d252ee61995df37b4a4cb92e06.zip | |
Fix wrong hint when deleting a branch successfully from pull request UI (#22673)
Fix #18785
| -rw-r--r-- | routers/web/repo/pull.go | 2 | ||||
| -rw-r--r-- | 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 c2208120fc..71bc98d13d 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 491fc0e0aa..e80822a752 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) }) } |