Gitea-John71/Gitea
2
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-08-05 03:10:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: make commit message merge correctly (#38490) (#38502)

Browse Source 
Backport #38490

fix #38487

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
Co-authored-by: silverwind <me@silverwind.io>
Co-authored-by: bircni <bircni@icloud.com>
This commit is contained in:
Giteabot
2026-07-17 01:09:01 -07:00
committed by GitHub
parent 7199547218
commit 895d848ff4
5 changed files with 101 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/integration/pull_merge_test.go
+2 -1
View File
@@ -1321,7 +1321,8 @@ Co-authored-by: user4 <user4@example.com>
pullIndex, err := strconv.ParseInt(elems[4], 10, 64)
assert.NoError(t, err)
pullRequest := unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{BaseRepoID: repo.ID, Index: pullIndex})
squashMergeCommitMessage := pull_service.GetSquashMergeCommitMessages(t.Context(), pullRequest)
squashMergeCommitMessage, err := pull_service.GetSquashMergeCommitMessages(t.Context(), pullRequest)
assert.NoError(t, err)
assert.Equal(t, tc.expectedMessage, squashMergeCommitMessage)
})
}