public/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-07-15 20:40:52 +09:00
Code Issues Packages Projects Releases Wiki Activity

fix(pull): preserve squash message trailers and additional commit messages (#37954)

Browse Source 
* Closes #37950
* Closes #37946
* Fixes https://github.com/go-gitea/gitea/issues/37529

---------

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
This commit is contained in:
bircni
2026-06-15 19:55:31 +02:00
committed by GitHub
parent 0eba0e371f
commit 7997c1ccad
5 changed files with 128 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/git/commit_message_test.go
+2
View File
@@ -26,8 +26,10 @@ func TestCommitMessageTrailer(t *testing.T) {
{"a", "a", "", ""},
{"a\n\nk", "a\n\nk", "", ""},
{"a\n\nk:v", "a", "\n\n", "k:v"},
{"a\n\nk:v\n\n", "a", "\n\n", "k:v\n\n"},
{"a\n--\nk:v", "a\n--\nk:v", "", ""},
{"a\n---\nk:v", "a", "\n---\n", "k:v"},
{"a\n\n---\n\nk:v", "a\n", "\n---\n\n", "k:v"},
{"k: v", "", "", "k: v"},
{"\nk:v", "", "\n", "k:v"},