improve

Author: wxiaoguang

services/pull/merge.go

@@ -186,7 +186,7 @@ func AddCommitMessageTailer(message, tailerKey, tailerValue string) string {
 		lastLineKey = message[pos1+1 : pos2]
 	}
 
-	isLikelyTailerLine := lastLineKey != "" && unicode.IsUpper(rune(lastLineKey[0]))
+	isLikelyTailerLine := lastLineKey != "" && unicode.IsUpper(rune(lastLineKey[0])) && strings.Contains(message, "-")
 	for i := 0; isLikelyTailerLine && i < len(lastLineKey); i++ {
 		r := rune(lastLineKey[i])
 		isLikelyTailerLine = unicode.IsLetter(r) || unicode.IsDigit(r) || r == '-'

services/pull/merge_test.go

@@ -72,7 +72,9 @@ func TestAddCommitMessageTailer(t *testing.T) {
 
 	// add tailer for message without newlines
 	assert.Equal(t, "title\n\nTest-tailer: TestValue", AddCommitMessageTailer("title", "Test-tailer", "TestValue"))
-	assert.Equal(t, "title\n\nnot tailer: xxx\n\nTest-tailer: TestValue", AddCommitMessageTailer("title\n\nnot tailer: xxx", "Test-tailer", "TestValue"))
+	assert.Equal(t, "title\n\nNot tailer: xxx\n\nTest-tailer: TestValue", AddCommitMessageTailer("title\n\nNot tailer: xxx", "Test-tailer", "TestValue"))
+	assert.Equal(t, "title\n\nNotTailer: xxx\n\nTest-tailer: TestValue", AddCommitMessageTailer("title\n\nNotTailer: xxx", "Test-tailer", "TestValue"))
+	assert.Equal(t, "title\n\nnot-tailer: xxx\n\nTest-tailer: TestValue", AddCommitMessageTailer("title\n\nnot-tailer: xxx", "Test-tailer", "TestValue"))
 
 	// add tailer for message with one EOL
 	assert.Equal(t, "title\n\nTest-tailer: TestValue", AddCommitMessageTailer("title\n", "Test-tailer", "TestValue"))